From ed11cf70be0935d8e5dd389e829aa2527ccf674f Mon Sep 17 00:00:00 2001 From: Thomas Osterried Date: Tue, 31 Jan 2012 23:18:37 +0000 Subject: Fixed Bug: libax25 cannot find interfaces with callsign's without SSID. In http://www.linux-ax25.org/cvsweb/libax25/ChangeLog we read: Revision 1.8: download - view: text, markup, annotated - select for diffs Thu Sep 10 16:53:28 2009 UTC (2 years, 4 months ago) by ralf Branches: MAIN CVS tags: HEAD Diff to: previous 1.7: preferred, colored Changes since revision 1.7: +5 -0 lines ax25_ntoa: Don't emit SSID suffix if the SSID is zero. From: Matti Aarnio OH2MQK In http://www.linux-ax25.org/cvsweb/libax25/axutils.c.diff?r1=1.4;r2=1.5 funtion char *ax25_ntoa(const ax25_address *a): - *s++ = '-'; + /* Convention is: -0 suffixes are NOT printed */ + if (a->ax25_call[6] & 0x1E) { + *s++ = '-'; - if ((n = ((a->ax25_call[6] >> 1) & 0x0F)) > 9) { - *s++ = '1'; - n -= 10; + if ((n = ((a->ax25_call[6] >> 1) & 0x0F)) > 9) { + *s++ = '1'; + n -= 10; + } + *s++ = n + '0'; } - - *s++ = n + '0'; + *s++ = '\0'; This is diametral to the previous situation, where ax25_ntoa always returned a call with SSID. Unfortunately, that patch broke a fixe introduced in April 2009; that patch fixed the same issue introduced by a patch in April 2008: http://www.linux-ax25.org/cvsweb/libax25/axconfig.c This is a fix for a bug introduced 2008-04-02, which caused interfaces containing CALL without SSID not being found anymore (user had to address CALL-0 instead of just CALL). http://www.linux-ax25.org/cvsweb/libax25/axconfig.c.diff?r1=1.7;r2=1.8 [..] + /* user may have configured "DL9SAU". But we compare to *ifcalls, + * which comes from ifr_hwaddr.sa_data and it always contains a SSID; + * in this case, "DL9SAU-0". This fixes a bug introduced 2008-04-02, + * which caused interfaces without SSID not being found anymore. :( + */ [..] It has been overseen that libax25 internaly uses ax25_ntoa, not just for user-presentation. The fix today resolves the problem, and cleans up helper routines like strip_zero_ssid() that are no longer needed. Affected files: axconfig.c, nrconfig.c and procutils.c. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 91b76c3..1dd5dcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + * Interfaces with a callsign without SSID were not been found anymore + after the last patch below. See cvs comment for detail. + Affected files: axconfig.c, nrconfig.c and procutils.c. + + -- Thomas Osterried DL9SAU Wed, 01 Feb 2012 00:10:45 +0100 + * ax25_ntoa() does no longer print a zero SSID. This avoids addresses like AB3DEF-0 which is general convention anyway. -- cgit v1.2.3