|
[-]
[+]
|
Changed |
radvd.changes
|
|
|
|
[-]
[+]
|
Changed |
radvd.spec
^
|
|
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/CHANGES
^
|
| @@ -1,3 +1,6 @@
+2013/11/20 Fixed attempt to get multiple values in an ioctl
+ improved logging of hardware type
+
2013/11/17 AdvSendAdvert was being ignored in some cases <Babel>
2013/10/02 releasing 1.9.5
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/Makefile.am
^
|
| @@ -21,10 +21,6 @@
-DPATH_RADVD_PID=\"$(PATH_RADVD_PID)\" \
-DVERSION=\"$(VERSION)\"
-INCLUDES = \
- -I$(srcdir) \
- -I.
-
COMMON_SRC = \
defaults.h \
includes.h \
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/Makefile.in
^
|
| @@ -291,10 +291,6 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.2 foreign
-INCLUDES = \
- -I$(srcdir) \
- -I.
-
COMMON_SRC = \
defaults.h \
includes.h \
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/VERSION
^
|
| @@ -3,4 +3,4 @@
#
# If adding rcX, be sure to separate with a '-'
#
-1.9.6
+1.9.7
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/device-linux.c
^
|
| @@ -37,8 +37,8 @@
strncpy(ifr.ifr_name, iface->Name, IFNAMSIZ-1);
ifr.ifr_name[IFNAMSIZ-1] = '\0';
- if (ioctl(sock, SIOCGIFMTU | SIOCGIFHWADDR, &ifr) < 0) {
- flog(LOG_ERR, "ioctl() failed for %s: %s",
+ if (ioctl(sock, SIOCGIFMTU, &ifr) < 0) {
+ flog(LOG_ERR, "ioctl(SIOCGIFMTU) failed for %s: %s",
iface->Name, strerror(errno));
return (-1);
}
@@ -46,19 +46,23 @@
dlog(LOG_DEBUG, 3, "mtu for %s is %d", iface->Name, ifr.ifr_mtu);
iface->if_maxmtu = ifr.ifr_mtu;
- dlog(LOG_DEBUG, 3, "hardware type for %s is %d", iface->Name,
- ifr.ifr_hwaddr.sa_family);
-
+ if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
+ flog(LOG_ERR, "ioctl(SIOCGIFHWADDR) failed for %s: %s",
+ iface->Name, strerror(errno));
+ return (-1);
+ }
switch(ifr.ifr_hwaddr.sa_family)
{
case ARPHRD_ETHER:
iface->if_hwaddr_len = 48;
iface->if_prefix_len = 64;
+ dlog(LOG_DEBUG, 3, "hardware type for %s is ARPHRD_ETHER", iface->Name);
break;
#ifdef ARPHRD_FDDI
case ARPHRD_FDDI:
iface->if_hwaddr_len = 48;
iface->if_prefix_len = 64;
+ dlog(LOG_DEBUG, 3, "hardware type for %s is ARPHRD_FDDI", iface->Name);
break;
#endif /* ARPHDR_FDDI */
#ifdef ARPHRD_ARCNET
@@ -66,12 +70,15 @@
iface->if_hwaddr_len = 8;
iface->if_prefix_len = -1;
iface->if_maxmtu = -1;
+ dlog(LOG_DEBUG, 3, "hardware type for %s is ARPHRD_ARCNET", iface->Name);
break;
#endif /* ARPHDR_ARCNET */
default:
iface->if_hwaddr_len = -1;
iface->if_prefix_len = -1;
iface->if_maxmtu = -1;
+ dlog(LOG_DEBUG, 3, "hardware type for %s is %d", iface->Name,
+ ifr.ifr_hwaddr.sa_family);
break;
}
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/radvd.c
^
|
| @@ -544,6 +544,7 @@
gettimeofday(&iface->last_multicast, NULL);
+ /* TODO: AdvSendAdvert is being checked in send_ra now so it can be removed here. */
if (!iface->AdvSendAdvert)
continue;
@@ -569,6 +570,7 @@
for (iface=IfaceList; iface; iface=iface->next) {
if( ! iface->UnicastOnly ) {
+ /* TODO: AdvSendAdvert is being checked in send_ra now so it can be removed here. */
if (iface->AdvSendAdvert) {
/* send a final advertisement with zero Router Lifetime */
iface->cease_adv = 1;
|
|
[-]
[+]
|
Changed |
radvd-1.9.7.tar.bz2/redhat/radvd.spec
^
|
| @@ -5,7 +5,7 @@
Summary: A Router Advertisement daemon
Name: radvd
-Version: 1.9.6
+Version: 1.9.7
Release: 1
# The code includes the advertising clause, so it's GPL-incompatible
License: BSD with advertising
|
