Re: Bug#478693: Incompatibility of libc6 with kernel 2.6 ax25
On Sat, May 10, 2008 at 10:33:59PM +0200, Aurelien Jarno wrote:
> tag 478693 + moreinfo
> thanks
>
> On Wed, Apr 30, 2008 at 01:57:26PM +0200, Arjan van Schijndel wrote:
> > Package: libc6
> > Version: 2.3.6.ds1-13etch5
> >
> > The following files in libc6 are not up to date: netax25/ax25.h
> > netrom/netrom.h netrose/rose.h. Meaning these files do not correspond
> > with the ax25.h netrom.h and rose.h from the 2.6 kernel. Resulting in
> > a wrong syscall.h.
>
> Could you please give more details?
>
> A quick look showed that netrose/rose.h and linux/rose.h are the same.
>
> linux/ax25.h and linux/rose.h have a few more definitions netax25/ax25.h
> and netrom/netrom.h, but the #define and structures present in the glibc
> one are the same than the ones in the kernel.
>
> The best would be to tell us which structures / #define are missing to
> get you application compiled.
>
A closer look showed that the only outdated part is in netax25/ax25.h.
netrom/netrom.h and netrose/rose.h are up-to-date.
Here are a patch to update netax25/ax25.h. Could you please try it and
see if it fixes your problems?
diff --git a/sysdeps/unix/sysv/linux/netax25/ax25.h b/sysdeps/unix/sysv/linux/netax25/ax25.h
index ce3c7ab..3ca2b4d 100644
--- a/sysdeps/unix/sysv/linux/netax25/ax25.h
+++ b/sysdeps/unix/sysv/linux/netax25/ax25.h
@@ -50,9 +50,11 @@
#define SIOCAX25SETPARMS (SIOCPROTOPRIVATE+6)
#define SIOCAX25OPTRT (SIOCPROTOPRIVATE+7)
#define SIOCAX25CTLCON (SIOCPROTOPRIVATE+8)
-#define SIOCAX25GETINFO (SIOCPROTOPRIVATE+9)
+#define SIOCAX25GETINFOOLD (SIOCPROTOPRIVATE+9)
#define SIOCAX25ADDFWD (SIOCPROTOPRIVATE+10)
#define SIOCAX25DELFWD (SIOCPROTOPRIVATE+11)
+#define SIOCAX25DEVCTL (SIOCPROTOPRIVATE+12)
+#define SIOCAX25GETINFO (SIOCPROTOPRIVATE+13)
/* unknown: */
#define AX25_NOUID_DEFAULT 0
@@ -112,13 +114,16 @@ struct ax25_ctl_struct
struct ax25_info_struct
{
- unsigned int n2, n2count;
+ unsigned int n2, n2count;
unsigned int t1, t1timer;
unsigned int t2, t2timer;
unsigned int t3, t3timer;
unsigned int idle, idletimer;
unsigned int state;
unsigned int rcv_q, snd_q;
+ unsigned int vs, vr, va, vs_max;
+ unsigned int paclen;
+ unsigned int window;
};
struct ax25_fwd_struct
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' aurel32@debian.org | aurelien@aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
Reply to: