diff options
| author | Julian Elischer <julian@FreeBSD.org> | 1996-08-19 02:32:44 +0000 |
|---|---|---|
| committer | Julian Elischer <julian@FreeBSD.org> | 1996-08-19 02:32:44 +0000 |
| commit | 4174225d832b9fa132354eff115d28b8204cb96e (patch) | |
| tree | fc90827546e8409cf05f72ad68e99dc519e2591f /sys/netatalk/at_control.c | |
| parent | fed06968ba048763bf98090a3b7aa8ad62898a2c (diff) | |
fix a broken atalk stack..
the lat commits (3 weeks ago ) broke this, and I'm only now getting
complaints.. oops!
Notes
Notes:
svn path=/head/; revision=17661
Diffstat (limited to 'sys/netatalk/at_control.c')
| -rw-r--r-- | sys/netatalk/at_control.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 91e8653c1c82..a2d3a4ed529f 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -136,7 +136,7 @@ at_control( int cmd, caddr_t data, struct ifnet *ifp, struct proc *p ) } aa->aa_ifa.ifa_addr = (struct sockaddr *)&aa->aa_addr; - aa->aa_ifa.ifa_dstaddr = (struct sockaddr *)&aa->aa_dstaddr; + aa->aa_ifa.ifa_dstaddr = (struct sockaddr *)&aa->aa_addr; aa->aa_ifa.ifa_netmask = (struct sockaddr *)&aa->aa_netmask; /* @@ -378,12 +378,24 @@ at_ifinit( ifp, aa, sat ) return( error ); } +#if 1 +/* this works */ + aa->aa_netmask.sat_len = 6/*sizeof(struct sockaddr_at)*/; + aa->aa_netmask.sat_family = AF_APPLETALK; + aa->aa_netmask.sat_addr.s_net = 0xffff; + aa->aa_netmask.sat_addr.s_node = 0; + aa->aa_ifa.ifa_netmask =(struct sockaddr *) &(aa->aa_netmask); /* XXX */ + +#else +/* this doesn't */ /* Initialize netmask and broadcast address */ bzero(&aa->aa_netmask, sizeof(aa->aa_netmask)); - aa->aa_ifa.ifa_netmask = (struct sockaddr *) &aa->aa_netmask; aa->aa_netmask.sat_len = sizeof(struct sockaddr_at); aa->aa_netmask.sat_family = AF_APPLETALK; + aa->aa_netmask.sat_addr.s_net = 0xffff; + aa->aa_netmask.sat_addr.s_node = 0; + aa->aa_ifa.ifa_netmask = (struct sockaddr *) &aa->aa_netmask; bzero(&aa->aa_broadaddr, sizeof(aa->aa_broadaddr)); aa->aa_ifa.ifa_broadaddr = (struct sockaddr *) &aa->aa_broadaddr; @@ -406,9 +418,10 @@ at_ifinit( ifp, aa, sat ) } else if (ifp->if_flags & IFF_POINTOPOINT) { aa->aa_ifa.ifa_dstaddr = aa->aa_ifa.ifa_addr; aa->aa_netmask.sat_addr.s_net = htons(0xffff); - aa->aa_netmask.sat_addr.s_node = htons(0xffff); + aa->aa_netmask.sat_addr.s_node = 0xff; flags |= RTF_HOST; } +#endif error = rtinit(&aa->aa_ifa, RTM_ADD, flags); #if 0 |