summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaul <paul>2004-08-19 06:45:33 +0200
committerpaul <paul>2004-08-19 06:45:33 +0200
commit0de1cde6e602e7496628967aeb219cd28d4869a9 (patch)
treea9e15f53ed1196396d9f3370a42ccbd4b2aaf21e
parent2004-08-19 Paul Jakma <paul@dishone.st> (diff)
downloadfrr-0de1cde6e602e7496628967aeb219cd28d4869a9.tar.xz
frr-0de1cde6e602e7496628967aeb219cd28d4869a9.zip
2004-08-19 Paul Jakma <paul@dishone.st>
* irdp_main.c: update to match sockopt renames. * irdp_packet.c: include sockopt.h and update to match sockopt renames.
-rw-r--r--zebra/ChangeLog6
-rw-r--r--zebra/irdp_main.c2
-rw-r--r--zebra/irdp_packet.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 5adcbceec..0b54f29a6 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-19 Paul Jakma <paul@dishone.st>
+
+ * irdp_main.c: update to match sockopt renames.
+ * irdp_packet.c: include sockopt.h and update to match sockopt
+ renames.
+
2004-08-11 Greg Troxel <gdt@fnord.ir.bbn.com>
* rtadv.c (rtadv_send_packet): Allocate space for control messages
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index fd56c8810..f711d8521 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -124,7 +124,7 @@ irdp_sock_init (void)
return ret;
};
- ret = setsockopt_pktinfo_ipv4 (irdp_sock, 1);
+ ret = setsockopt_pktinfo (AF_INET, irdp_sock, 1);
if (ret < 0) {
zlog_warn ("IRDP: can't do irdp sockopt %s", strerror(errno));
return ret;
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index e881ef937..8cd3dad65 100644
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -61,7 +61,7 @@
#include "if.h"
#include "sockunion.h"
#include "log.h"
-
+#include "sockopt.h"
/* GLOBAL VARS */
@@ -214,7 +214,7 @@ int irdp_recvmsg (int sock,
return ret;
}
- ifindex = getsockopt_pktinfo_ifindex (AF_INET, &msg);
+ ifindex = getsockopt_ifindex (AF_INET, &msg);
return ret;
}