proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 15:33:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2003-10-22 Paul Jakma <paul@dishone.st>

Browse Source 
* zebra/kernel_socket.c: HAVE_IPV6 conditional for WRAPUP when
          HAVE_SA_LEN is not defined. bcopy -> memcpy, bcopy is not
          portable.
This commit is contained in:
paul 2003-10-22 02:51:38 +00:00
parent 1ac09d3e43
commit 30be80287a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zebra/kernel_socket.c
View File

@ -45,16 +45,24 @@ extern struct zebra_t zebrad;
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
/* And this macro is wrapper for handling sa_len. */ /* And this macro is wrapper for handling sa_len. */
#ifdef HAVE_SA_LEN #if defined(HAVE_SA_LEN)
#define WRAPUP(X) ROUNDUP(((struct sockaddr *)(X))->sa_len) #define WRAPUP(X) ROUNDUP(((struct sockaddr *)(X))->sa_len)
#else #elif defined(HAVE_IPV6)
#define WRAPUP(X) \ #define WRAPUP(X) \
do { \
(((struct sockaddr *)(X))->sa_family == AF_INET ? \ (((struct sockaddr *)(X))->sa_family == AF_INET ? \
ROUNDUP(sizeof(struct sockaddr_in)):\ ROUNDUP(sizeof(struct sockaddr_in)):\
(((struct sockaddr *)(X))->sa_family == AF_INET6 ? \ (((struct sockaddr *)(X))->sa_family == AF_INET6 ? \
ROUNDUP(sizeof(struct sockaddr_in6)) : \ ROUNDUP(sizeof(struct sockaddr_in6)) : \
(((struct sockaddr *)(X))->sa_family == AF_LINK ? \ (((struct sockaddr *)(X))->sa_family == AF_LINK ? \
ROUNDUP(sizeof(struct sockaddr_dl)) : sizeof(struct sockaddr)))) ROUNDUP(sizeof(struct sockaddr_dl)) : sizeof(struct sockaddr)))) \
} while (0)
#else /* HAVE_IPV6 */
#define WRAPUP(X) \
(((struct sockaddr *)(X))->sa_family == AF_INET ? \
ROUNDUP(sizeof(struct sockaddr_in)):\
(((struct sockaddr *)(X))->sa_family == AF_LINK ? \
ROUNDUP(sizeof(struct sockaddr_dl)) : sizeof(struct sockaddr)))
#endif /* HAVE_SA_LEN */ #endif /* HAVE_SA_LEN */
/* Routing socket message types. */ /* Routing socket message types. */
@ -250,7 +258,7 @@ ifm_read (struct if_msghdr *ifm)
*/ */
if (sdl != NULL) if (sdl != NULL)
{ {
bcopy(sdl->sdl_data, ifname, sdl->sdl_nlen); memcpy (ifname, sdl->sdl_data, sdl->sdl_nlen);
ifname[sdl->sdl_nlen] = '\0'; ifname[sdl->sdl_nlen] = '\0';
ifp = if_lookup_by_name (ifname); ifp = if_lookup_by_name (ifname);
} }