From 90175ff2abfebed07c0e7c00a94a7651c4a1ba93 Mon Sep 17 00:00:00 2001
From: Hansi Reiser <dl9rdz@darc.de>
Date: Sat, 18 Jan 2020 23:46:08 +0100
Subject: [PATCH 1/2] option -u ip:port to send axudp data to udp port (e.g.,
 aprsmap)

---
 tools/pos2aprs.pl | 64 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/tools/pos2aprs.pl b/tools/pos2aprs.pl
index 33ea005..6d0b018 100755
--- a/tools/pos2aprs.pl
+++ b/tools/pos2aprs.pl
@@ -1,8 +1,10 @@
 #!/usr/bin/env perl
 ## aprs-output provided by daniestevez
+## axudp extensions provided by dl9rdz
 use strict;
 use warnings;
-
+use IO::Socket::INET;
+use Getopt::Long;
 
 my $filename = undef;
 my $date = undef;
@@ -11,6 +13,9 @@ my $mycallsign;
 my $passcode;
 my $comment;
 
+my $udp;
+GetOptions("u=s" => \$udp) or die "Error in command line arguments\n";
+
 while (@ARGV) {
   $mycallsign = shift @ARGV;
   $passcode = shift @ARGV;
@@ -45,6 +50,58 @@ my $callsign;
 
 my $temp;
 
+# axudp: encodecall: encode single call sign ("AB0CDE-12*") up to 6 letters/numbers, ssid 0..15, optional "*"; last: set in last call sign (dst/via)
+sub encodecall{
+	my $call = shift;
+	my $last = shift;
+	if(!($call =~ /^([A-Z0-9]{1,6})(-\d+|)(\*|)$/)) {
+		die "Callsign $call not properly formatted";
+	};
+	my $callsign = $1 . ' 'x(6-length($1));
+	my $ssid = length($2)>0 ? 0-$2 : 0;
+	my $hbit = $3 eq '*' ? 0x80 : 0;
+	my $encoded = join('',map chr(ord($_)<<1),split //,$callsign);
+	$encoded .= chr($hbit | 0x60 | ($ssid<<1) | ($last?1:0));
+	return $encoded;
+}
+
+# kissmkhead: input: list of callsigns (src, dest, repeater list); output: raw kiss frame header data
+sub kissmkhead {
+	my @calllist = @_;
+	my $last = pop @calllist;
+	my $enc = join('',map encodecall($_),@calllist);
+	$enc .= encodecall($last, 1);
+	return $enc;
+}
+
+#create CRC tab
+my @CRCL;
+my @CRCH;
+my ($c, $crc,$i);
+for $c (0..255) {
+	$crc = 255-$c;
+	for $i (0..7) {  $crc = ($crc&1) ? ($crc>>1)^0x8408 : ($crc>>1); }
+	$CRCL[$c] = $crc&0xff;
+	$CRCH[$c] = (255-($crc>>8))&0xff;
+}
+sub appendcrc {
+	$_ = shift;
+	my @data = split //,$_;
+	my ($b, $l, $h)=(0,0,0);
+	for(@data) { $b = ord($_) ^ $l; $l = $CRCL[$b] ^ $h; $h = $CRCH[$b]; }
+	$_ .= chr($l) . chr($h);
+	return $_;
+}
+
+my ($sock,$kissheader);
+if($udp) {
+	my ($udpserver,$udpport)=split ':',$udp;
+	$udpserver = "127.0.0.1" unless $udpserver;
+	$sock = new IO::Socket::INET(PeerAddr => $udpserver, PeerPort => $udpport, Proto => "udp", Timeout => 1) or die "Error creating socket";
+	# $kissheader = kissmkhead(uc($mycallsign),"APRS","TCPIP*");
+	$kissheader = kissmkhead(uc($mycallsign),"APRS");
+}
+
 print $fpo "user $mycallsign pass $passcode vers \"RS decoder\"\n";
 
 while ($line = <$fpi>) {
@@ -92,6 +149,11 @@ while ($line = <$fpi>) {
 	    $str = sprintf("$mycallsign>APRS,TCPIP*:;%-9s*%06dh%07.2f$NS/%08.2f${EW}O%03d/%03d/A=%06d$comment$temp", $callsign, $hms, $lat, $lon, $course, $speed, $alt);
 	    print $fpo "$str\n";
 
+	    if($sock) {
+	        $str = (split(":",$str))[1];
+		print $sock appendcrc($kissheader.chr(0x03).chr(0xf0).$str);
+	    }
+
     }
     #elsif ($line =~ / # xdata = (.*)/) { ## nicht, wenn (oben) alle Zeilen ausgeben werden
     #    if ($1) {

From b97af4b7b93ea14c65ea0bafba3b901fccfe2974 Mon Sep 17 00:00:00 2001
From: Hansi Reiser <dl9rdz@darc.de>
Date: Mon, 20 Jan 2020 20:44:07 +0100
Subject: [PATCH 2/2] fix src/dest order; parse dfm ids; be more tolerant in
 lat/lon/alt text

---
 tools/pos2aprs.pl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/pos2aprs.pl b/tools/pos2aprs.pl
index 6d0b018..615cc58 100755
--- a/tools/pos2aprs.pl
+++ b/tools/pos2aprs.pl
@@ -65,7 +65,7 @@ sub encodecall{
 	return $encoded;
 }
 
-# kissmkhead: input: list of callsigns (src, dest, repeater list); output: raw kiss frame header data
+# kissmkhead: input: list of callsigns (dest, src, repeater list); output: raw kiss frame header data
 sub kissmkhead {
 	my @calllist = @_;
 	my $last = pop @calllist;
@@ -98,8 +98,8 @@ if($udp) {
 	my ($udpserver,$udpport)=split ':',$udp;
 	$udpserver = "127.0.0.1" unless $udpserver;
 	$sock = new IO::Socket::INET(PeerAddr => $udpserver, PeerPort => $udpport, Proto => "udp", Timeout => 1) or die "Error creating socket";
-	# $kissheader = kissmkhead(uc($mycallsign),"APRS","TCPIP*");
-	$kissheader = kissmkhead(uc($mycallsign),"APRS");
+	# $kissheader = kissmkhead("APRS",uc($mycallsign),"TCPIP*");
+	$kissheader = kissmkhead("APRS",uc($mycallsign));
 }
 
 print $fpo "user $mycallsign pass $passcode vers \"RS decoder\"\n";
@@ -108,7 +108,7 @@ while ($line = <$fpi>) {
 
     print STDERR $line; ## entweder: alle Zeilen ausgeben
 
-    if ($line =~ /(\d\d):(\d\d):(\d\d\.?\d?\d?\d?).*\ +lat:\ *(-?\d*)(\.\d*)\ +lon:\ *(-?\d*)(\.\d*)\ +alt:\ *(-?\d*\.\d*).*/) {
+    if ($line =~ /(\d\d):(\d\d):(\d\d\.?\d?\d?\d?).*\ +lat:\ *(-?\d*)(\.\d*).*\ +lon:\ *(-?\d*)(\.\d*).*\ +alt:\ *(-?\d*\.\d*).*/) {
 
     #print STDERR $line; ## oder: nur Zeile mit Koordinaten ausgeben
 
@@ -135,7 +135,8 @@ while ($line = <$fpi>) {
             $course = $2;
         }
 
-	    if ($line =~ /\(([\w]+)\)/) {
+	    # match either (id) or (type:id) and return id
+	    if ($line =~ /\(.*?([\w]+)\)/) {
 	        $callsign = $1;
 	    }