diff options
| author | paul <paul> | 2003-05-26 00:25:34 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-05-26 00:25:34 +0000 |
| commit | a2642228fa2f7f4a287d05f17e09fb63953a05aa (patch) | |
| tree | 13005197447156ad362f5138726f8433324055a6 /lib/sockunion.c | |
| parent | ff8c45e1d68d32731f78f9b814ccfec976165a6c (diff) | |
| download | quagga-a2642228fa2f7f4a287d05f17e09fb63953a05aa.tar.bz2 quagga-a2642228fa2f7f4a287d05f17e09fb63953a05aa.tar.xz | |
Merge HEAD to zprivs
Diffstat (limited to 'lib/sockunion.c')
| -rw-r--r-- | lib/sockunion.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/sockunion.c b/lib/sockunion.c index 21371624..e4b311c7 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -302,16 +302,16 @@ sockunion_log (union sockunion *su) switch (su->sa.sa_family) { case AF_INET: - snprintf (buf, BUFSIZ, "%s", inet_ntoa (su->sin.sin_addr)); + snprintf (buf, SU_ADDRSTRLEN, "%s", inet_ntoa (su->sin.sin_addr)); break; #ifdef HAVE_IPV6 case AF_INET6: - snprintf (buf, BUFSIZ, "%s", - inet_ntop (AF_INET6, &(su->sin6.sin6_addr), buf, BUFSIZ)); + snprintf (buf, SU_ADDRSTRLEN, "%s", + inet_ntop (AF_INET6, &(su->sin6.sin6_addr), buf, SU_ADDRSTRLEN)); break; #endif /* HAVE_IPV6 */ default: - snprintf (buf, BUFSIZ, "af_unknown %d ", su->sa.sa_family); + snprintf (buf, SU_ADDRSTRLEN, "af_unknown %d ", su->sa.sa_family); break; } return buf; @@ -344,8 +344,13 @@ sockunion_connect (int fd, union sockunion *peersu, unsigned short port, { #ifdef HAVE_SIN6_SCOPE_ID /* su.sin6.sin6_scope_id = ifindex; */ +#ifdef MUSICA + su.sin6.sin6_scope_id = ifindex; +#endif #endif /* HAVE_SIN6_SCOPE_ID */ +#ifndef MUSICA SET_IN6_LINKLOCAL_IFINDEX (su.sin6.sin6_addr, ifindex); +#endif } #endif /* KAME */ break; |