diff options
| author | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-09 20:02:27 +0000 |
|---|---|---|
| committer | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-09 20:02:27 +0000 |
| commit | 120e91359392aa18f257cd88e77d762c32eb8a4f (patch) | |
| tree | e367f821165554a8dced5e8bcba8a9eedfc69778 /zebra/rtadv.c | |
| parent | aa04a120d60b4001bb6224a7efd6d49fec7ec622 (diff) | |
| parent | cc2dd9280c4456586080d1cf4537d26c02fa9a36 (diff) | |
| download | quagga-120e91359392aa18f257cd88e77d762c32eb8a4f.tar.bz2 quagga-120e91359392aa18f257cd88e77d762c32eb8a4f.tar.xz | |
Merge remote branch 'quagga/master' of /git/quagga.euro-ix
Diffstat (limited to 'zebra/rtadv.c')
| -rw-r--r-- | zebra/rtadv.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 0bcdafb0..8cc3c4cb 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -87,12 +87,6 @@ rtadv_new (void) return XCALLOC (MTYPE_TMP, sizeof (struct rtadv)); } -static void -rtadv_free (struct rtadv *rtadv) -{ - XFREE (MTYPE_TMP, rtadv); -} - static int rtadv_recv_packet (int sock, u_char *buf, int buflen, struct sockaddr_in6 *from, unsigned int *ifindex, @@ -138,7 +132,10 @@ rtadv_recv_packet (int sock, u_char *buf, int buflen, /* Incoming packet's hop limit. */ if (cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT) - *hoplimit = *((int *) CMSG_DATA (cmsgptr)); + { + int *hoptr = (int *) CMSG_DATA (cmsgptr); + *hoplimit = *hoptr; + } } return ret; } @@ -467,7 +464,7 @@ rtadv_read (struct thread *thread) int len; u_char buf[RTADV_MSG_SIZE]; struct sockaddr_in6 from; - unsigned int ifindex; + unsigned int ifindex = 0; int hoplimit = -1; sock = THREAD_FD (thread); |