Attachment 669945 Details for Bug 879869 – patch to fix mic-e encoding bug

[patch] patch to fix mic-e encoding bug

aprsd-2.2.5-15-mic-e.patch2 (text/plain), 1.49 KB, created by Alan Crosswell on 2012-12-28 19:19:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Crosswell

Created: 2012-12-28 19:19:11 UTC

Size: 1.49 KB

patch

obsolete

>diff -c -r aprsd-2.2.5-15.orig/src/ax25socket.cpp aprsd-2.2.5-15/src/ax25socket.cpp
>*** aprsd-2.2.5-15.orig/src/ax25socket.cpp	2003-05-29 14:26:33.000000000 -0400
>--- aprsd-2.2.5-15/src/ax25socket.cpp	2012-12-28 14:07:25.258153902 -0500
>***************
>*** 288,300 ****
>      // No rewriting for mic-e frames because aprsd does this later
>      sprintf ((char*)buf1, "%s>%s%s:", from, to, digis);
>      l = strlen ((char*)buf1);
>      for (i = 0; i < len; i++, l++) {
>!         buf1[l] = (isprint (buf[i])) ? buf[i] : ' ';    // keep it clean
>      }
>  
>-     buf1[l++] = 0x0d;
>-     buf1[l++] = 0x0a;
>- 
>      buf1[l] = '\0';
>      return;
>  }
>--- 288,303 ----
>      // No rewriting for mic-e frames because aprsd does this later
>      sprintf ((char*)buf1, "%s>%s%s:", from, to, digis);
>      l = strlen ((char*)buf1);
>+     // this "cleanup" introduced a bug as it was checking isprint() and blanking any
>+     // characters that didn't pass. The APRS protocol for MIC-E format
>+     // includes non-printing characters between 0x1c-0x7f. It's not entirely clear why
>+     // we wouldn't just pass the data through with no "cleanup". A different patch was
>+     // written for Debian, but I believe that patch to be incorrect as it was dropping
>+     // rather than blanking "bad" characters. Similarly, concatenating CRLF is also a bug.
>      for (i = 0; i < len; i++, l++) {
>!         buf1[l] = (buf[i] >= 0x1c && buf[i] <= 0x7f) ? buf[i] : ' ';    // keep it clean
>      }
>  
>      buf1[l] = '\0';
>      return;
>  }

Actions: View | Diff

Attachments on bug 879869: 651312 | 651313 | 669945 | 669946 | 746459 | 746460