cellular-infrastructure
/
osmo-ggsn
mirror of https://gerrit.osmocom.org/osmo-ggsn
9
0
Fork 0
Code Issues Releases Wiki Activity

lib/netdev.c: Cosmetic changes (coding style / cleanups) 

Change-Id: I60cbca616a4f727e2374c52715f9286a0f4c5e4b
This commit is contained in:
Harald Welte 2018-04-25 17:49:28 +02:00
parent c5efb5bccb
commit 47adad0817
1 changed files with 11 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/netdev.c
View File

@ -109,7 +109,6 @@ int netdev_setaddr4(const char *devname, struct in_addr *addr,
#if defined(__linux__)
ifr.ifr_netmask.sa_family = AF_INET;
#elif defined(__FreeBSD__) || defined (__APPLE__)
((struct sockaddr_in *)&ifr.ifr_addr)->sin_len =
sizeof(struct sockaddr_in);
@ -157,7 +156,6 @@ int netdev_setaddr4(const char *devname, struct in_addr *addr,
#if defined(__linux__)
memcpy(&((struct sockaddr_in *)&ifr.ifr_netmask)->sin_addr,
netmask, sizeof(*netmask));
#elif defined(__FreeBSD__) || defined (__APPLE__)
((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr =
netmask->s_addr;
@ -173,13 +171,10 @@ int netdev_setaddr4(const char *devname, struct in_addr *addr,
close(fd);
/* On linux the route to the interface is set automatically
on FreeBSD we have to do this manually */
/* TODO: How does it work on Solaris? */
netdev_sifflags(devname, IFF_UP | IFF_RUNNING);
/* On linux the route to the interface is set automatically
on FreeBSD we have to do this manually */
#if defined(__FreeBSD__) || defined (__APPLE__)
netdev_addroute(dstaddr, addr, &this->netmask);
#endif
@ -253,13 +248,10 @@ int netdev_setaddr6(const char *devname, struct in6_addr *addr, struct in6_addr
close(fd);
/* On linux the route to the interface is set automatically
on FreeBSD we have to do this manually */
/* TODO: How does it work on Solaris? */
netdev_sifflags(devname, IFF_UP | IFF_RUNNING);
/* On linux the route to the interface is set automatically
on FreeBSD we have to do this manually */
#if 0 /* FIXME */
//#if defined(__FreeBSD__) || defined (__APPLE__)
netdev_addroute6(dstaddr, addr, prefixlen);
@ -271,7 +263,7 @@ int netdev_setaddr6(const char *devname, struct in6_addr *addr, struct in6_addr
int netdev_addaddr4(const char *devname, struct in_addr *addr,
struct in_addr *dstaddr, struct in_addr *netmask)
{
int fd;
#if defined(__linux__)
struct {
struct nlmsghdr n;
@ -281,7 +273,6 @@ int netdev_addaddr4(const char *devname, struct in_addr *addr,
struct sockaddr_nl local;
socklen_t addr_len;
int fd;
int status;
struct sockaddr_nl nladdr;
@ -374,14 +365,7 @@ int netdev_addaddr4(const char *devname, struct in_addr *addr,
close(fd);
return -1;
}
close(fd);
return 0;
#elif defined (__FreeBSD__) || defined (__APPLE__)
int fd;
struct ifaliasreq areq;
memset(&areq, 0, sizeof(areq));
@ -420,18 +404,15 @@ int netdev_addaddr4(const char *devname, struct in_addr *addr,
close(fd);
return -1;
}
#endif
close(fd);
return 0;
#endif
}
int netdev_addaddr6(const char *devname, struct in6_addr *addr,
struct in6_addr *dstaddr, int prefixlen)
{
int fd;
#if defined(__linux__)
struct {
struct nlmsghdr n;
@ -441,7 +422,6 @@ int netdev_addaddr6(const char *devname, struct in6_addr *addr,
struct sockaddr_nl local;
socklen_t addr_len;
int fd;
int status;
struct sockaddr_nl nladdr;
@ -534,14 +514,7 @@ int netdev_addaddr6(const char *devname, struct in6_addr *addr,
close(fd);
return -1;
}
close(fd);
return 0;
#elif defined (__FreeBSD__) || defined (__APPLE__)
int fd;
struct ifaliasreq areq;
memset(&areq, 0, sizeof(areq));
@ -575,21 +548,16 @@ int netdev_addaddr6(const char *devname, struct in6_addr *addr,
close(fd);
return -1;
}
#endif
close(fd);
return 0;
#endif
}
static int netdev_route(struct in_addr *dst, struct in_addr *gateway, struct in_addr *mask, int delete)
{
#if defined(__linux__)
struct rtentry r;
int fd;
#if defined(__linux__)
struct rtentry r;
memset(&r, '\0', sizeof(r));
r.rt_flags = RTF_UP | RTF_GATEWAY; /* RTF_HOST not set */
@ -624,19 +592,13 @@ static int netdev_route(struct in_addr *dst, struct in_addr *gateway, struct in_
return -1;
}
}
close(fd);
return 0;
#elif defined(__FreeBSD__) || defined (__APPLE__)
struct {
struct rt_msghdr rt;
struct sockaddr_in dst;
struct sockaddr_in gate;
struct sockaddr_in mask;
} req;
int fd;
struct rt_msghdr *rtm;
if ((fd = socket(AF_ROUTE, SOCK_RAW, 0)) == -1) {
@ -676,10 +638,9 @@ static int netdev_route(struct in_addr *dst, struct in_addr *gateway, struct in_
close(fd);
return -1;
}
#endif
close(fd);
return 0;
#endif
}
int netdev_addroute(struct in_addr *dst, struct in_addr *gateway, struct in_addr *mask)