From ab9d73629872a474d9194177fa4c9c8cdabe9a44 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 4 Jun 2013 11:32:19 +0200 Subject: [PATCH] link: add link management functions Same here as usual, break out link functions from xutils. Signed-off-by: Daniel Borkmann --- astraceroute/Makefile | 1 + curvetun/Makefile | 1 + dev.c | 1 + flowtop/Makefile | 1 + ifpps.c | 1 + ifpps/Makefile | 3 +- xutils.c => link.c | 111 ++--------------------------------- link.h | 18 ++++++ netsniff-ng/Makefile | 1 + trafgen/Makefile | 1 + xutils.c | 158 -------------------------------------------------- xutils.h | 6 -- 12 files changed, 30 insertions(+), 273 deletions(-) copy xutils.c => link.c (55%) create mode 100644 link.h diff --git a/astraceroute/Makefile b/astraceroute/Makefile index cc0a3cef..ba453955 100644 --- a/astraceroute/Makefile +++ b/astraceroute/Makefile @@ -10,6 +10,7 @@ astraceroute-objs = xmalloc.o \ bpf.o \ str.o \ sock.o \ + link.o \ dev.o \ geoip.o \ ring_rx.o \ diff --git a/curvetun/Makefile b/curvetun/Makefile index b2693edb..111664c3 100644 --- a/curvetun/Makefile +++ b/curvetun/Makefile @@ -7,6 +7,7 @@ curvetun-objs = xmalloc.o \ dev.o \ stun.o \ sock.o \ + link.o \ patricia.o \ corking.o \ trie.o \ diff --git a/dev.c b/dev.c index 74e07a16..cd18d9bf 100644 --- a/dev.c +++ b/dev.c @@ -8,6 +8,7 @@ #include "str.h" #include "sock.h" #include "die.h" +#include "link.h" #include "xutils.h" int device_ifindex(const char *ifname) diff --git a/flowtop/Makefile b/flowtop/Makefile index c909a402..ba22803c 100644 --- a/flowtop/Makefile +++ b/flowtop/Makefile @@ -12,6 +12,7 @@ flowtop-objs = xmalloc.o \ str.o \ sock.o \ dev.o \ + link.o \ hash.o \ dissector_eth.o \ dissector_80211.o \ diff --git a/ifpps.c b/ifpps.c index 2d0a5b08..bdda39db 100644 --- a/ifpps.c +++ b/ifpps.c @@ -19,6 +19,7 @@ #include "die.h" #include "dev.h" +#include "link.h" #include "xmalloc.h" #include "xutils.h" #include "ioops.h" diff --git a/ifpps/Makefile b/ifpps/Makefile index 637db760..6088ec6b 100644 --- a/ifpps/Makefile +++ b/ifpps/Makefile @@ -2,9 +2,8 @@ ifpps-libs = $(shell pkg-config --libs ncurses) ifpps-objs = xmalloc.o \ ioops.o \ - xutils.o \ promisc.o \ str.o \ - sock.o \ + link.o \ dev.o \ ifpps.o diff --git a/xutils.c b/link.c similarity index 55% copy from xutils.c copy to link.c index e4cc1a47..95f08162 100644 --- a/xutils.c +++ b/link.c @@ -1,76 +1,11 @@ -/* - * netsniff-ng - the packet sniffing beast - * Copyright 2009, 2010 Daniel Borkmann. - * Copyright 2009, 2010 Emmanuel Roullit. - * Subject to the GPL, version 2. - */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include +#include +#include -#include "die.h" -#include "str.h" -#include "xutils.h" -#include "ring.h" +#include "link.h" #include "sock.h" -#include "built_in.h" - -void set_epoll_descriptor(int fd_epoll, int action, int fd_toadd, int events) -{ - int ret; - struct epoll_event ev; - - memset(&ev, 0, sizeof(ev)); - ev.events = events; - ev.data.fd = fd_toadd; - - ret = epoll_ctl(fd_epoll, action, fd_toadd, &ev); - if (ret < 0) - panic("Cannot add socket for epoll!\n"); -} - -int set_epoll_descriptor2(int fd_epoll, int action, int fd_toadd, int events) -{ - struct epoll_event ev; - - memset(&ev, 0, sizeof(ev)); - ev.events = events; - ev.data.fd = fd_toadd; - - return epoll_ctl(fd_epoll, action, fd_toadd, &ev); -} +#include "str.h" u32 wireless_bitrate(const char *ifname) { @@ -229,41 +164,3 @@ int ethtool_drvinf(const char *ifname, struct ethtool_drvinfo *drvinf) return ret; } - -void register_signal(int signal, void (*handler)(int)) -{ - sigset_t block_mask; - struct sigaction saction; - - sigfillset(&block_mask); - - saction.sa_handler = handler; - saction.sa_mask = block_mask; - saction.sa_flags = SA_RESTART; - - sigaction(signal, &saction, NULL); -} - -void register_signal_f(int signal, void (*handler)(int), int flags) -{ - sigset_t block_mask; - struct sigaction saction; - - sigfillset(&block_mask); - - saction.sa_handler = handler; - saction.sa_mask = block_mask; - saction.sa_flags = flags; - - sigaction(signal, &saction, NULL); -} - -void set_itimer_interval_value(struct itimerval *itimer, unsigned long sec, - unsigned long usec) -{ - itimer->it_interval.tv_sec = sec; - itimer->it_interval.tv_usec = usec; - - itimer->it_value.tv_sec = sec; - itimer->it_value.tv_usec = usec; -} diff --git a/link.h b/link.h new file mode 100644 index 00000000..67ec4335 --- /dev/null +++ b/link.h @@ -0,0 +1,18 @@ +#ifndef LINK_H +#define LINK_H + +#include +#include +#include +#include + +#include "built_in.h" + +extern int wireless_sigqual(const char *ifname, struct iw_statistics *stats); +extern int wireless_rangemax_sigqual(const char *ifname); +extern u32 wireless_bitrate(const char *ifname); +extern u32 ethtool_bitrate(const char *ifname); +extern int ethtool_drvinf(const char *ifname, struct ethtool_drvinfo *drvinf); +extern int ethtool_link(const char *ifname); + +#endif /* LINK_H */ diff --git a/netsniff-ng/Makefile b/netsniff-ng/Makefile index 9dfa8d25..02c61201 100644 --- a/netsniff-ng/Makefile +++ b/netsniff-ng/Makefile @@ -41,6 +41,7 @@ netsniff-ng-objs = dissector.o \ irq.o \ iosched.o \ ioops.o \ + link.o \ xutils.o \ xmalloc.o \ hash.o \ diff --git a/trafgen/Makefile b/trafgen/Makefile index 0ba1953c..69db4331 100644 --- a/trafgen/Makefile +++ b/trafgen/Makefile @@ -9,6 +9,7 @@ trafgen-objs = xmalloc.o \ proc.o \ dev.o \ irq.o \ + link.o \ str.o \ sock.o \ mac80211.o \ diff --git a/xutils.c b/xutils.c index e4cc1a47..d53a3e7f 100644 --- a/xutils.c +++ b/xutils.c @@ -72,164 +72,6 @@ int set_epoll_descriptor2(int fd_epoll, int action, int fd_toadd, int events) return epoll_ctl(fd_epoll, action, fd_toadd, &ev); } -u32 wireless_bitrate(const char *ifname) -{ - int sock, ret, rate_in_mbit; - struct iwreq iwr; - - sock = af_socket(AF_INET); - - memset(&iwr, 0, sizeof(iwr)); - strlcpy(iwr.ifr_name, ifname, IFNAMSIZ); - - ret = ioctl(sock, SIOCGIWRATE, &iwr); - if (!ret) - rate_in_mbit = iwr.u.bitrate.value / 1000000; - else - rate_in_mbit = 0; - - close(sock); - - return rate_in_mbit; -} - -int wireless_sigqual(const char *ifname, struct iw_statistics *stats) -{ - int ret, sock; - struct iwreq iwr; - - sock = af_socket(AF_INET); - - memset(&iwr, 0, sizeof(iwr)); - strlcpy(iwr.ifr_name, ifname, IFNAMSIZ); - - iwr.u.data.pointer = (caddr_t) stats; - iwr.u.data.length = sizeof(*stats); - iwr.u.data.flags = 1; - - ret = ioctl(sock, SIOCGIWSTATS, &iwr); - - close(sock); - - return ret; -} - -int wireless_rangemax_sigqual(const char *ifname) -{ - int ret, sock, sigqual; - struct iwreq iwr; - struct iw_range iwrange; - - sock = af_socket(AF_INET); - - memset(&iwrange, 0, sizeof(iwrange)); - - memset(&iwr, 0, sizeof(iwr)); - strlcpy(iwr.ifr_name, ifname, IFNAMSIZ); - - iwr.u.data.pointer = (caddr_t) &iwrange; - iwr.u.data.length = sizeof(iwrange); - iwr.u.data.flags = 0; - - ret = ioctl(sock, SIOCGIWRANGE, &iwr); - if (!ret) - sigqual = iwrange.max_qual.qual; - else - sigqual = 0; - - close(sock); - - return sigqual; -} - -u32 ethtool_bitrate(const char *ifname) -{ - int ret, sock, bitrate; - struct ifreq ifr; - struct ethtool_cmd ecmd; - - sock = af_socket(AF_INET); - - memset(&ecmd, 0, sizeof(ecmd)); - - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, ifname, IFNAMSIZ); - - ecmd.cmd = ETHTOOL_GSET; - ifr.ifr_data = (char *) &ecmd; - - ret = ioctl(sock, SIOCETHTOOL, &ifr); - if (ret) { - bitrate = 0; - goto out; - } - - switch (ecmd.speed) { - case SPEED_10: - case SPEED_100: - case SPEED_1000: - case SPEED_2500: - case SPEED_10000: - bitrate = ecmd.speed; - break; - default: - bitrate = 0; - break; - }; -out: - close(sock); - - return bitrate; -} - -int ethtool_link(const char *ifname) -{ - int ret, sock; - struct ifreq ifr; - struct ethtool_value ecmd; - - sock = af_socket(AF_INET); - - memset(&ecmd, 0, sizeof(ecmd)); - - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, ifname, IFNAMSIZ); - - ecmd.cmd = ETHTOOL_GLINK; - ifr.ifr_data = (char *) &ecmd; - - ret = ioctl(sock, SIOCETHTOOL, &ifr); - if (ret) - ret = -EINVAL; - else - ret = !!ecmd.data; - - close(sock); - return ret; -} - -int ethtool_drvinf(const char *ifname, struct ethtool_drvinfo *drvinf) -{ - int ret, sock; - struct ifreq ifr; - - sock = af_socket(AF_INET); - - memset(drvinf, 0, sizeof(*drvinf)); - - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, ifname, IFNAMSIZ); - - drvinf->cmd = ETHTOOL_GDRVINFO; - ifr.ifr_data = (char *) drvinf; - - ret = ioctl(sock, SIOCETHTOOL, &ifr); - - close(sock); - - return ret; -} - void register_signal(int signal, void (*handler)(int)) { sigset_t block_mask; diff --git a/xutils.h b/xutils.h index bfb24f12..b2287bb2 100644 --- a/xutils.h +++ b/xutils.h @@ -25,12 +25,6 @@ #include "built_in.h" -extern int wireless_sigqual(const char *ifname, struct iw_statistics *stats); -extern int wireless_rangemax_sigqual(const char *ifname); -extern u32 wireless_bitrate(const char *ifname); -extern u32 ethtool_bitrate(const char *ifname); -extern int ethtool_drvinf(const char *ifname, struct ethtool_drvinfo *drvinf); -extern int ethtool_link(const char *ifname); extern void register_signal(int signal, void (*handler)(int)); extern void register_signal_f(int signal, void (*handler)(int), int flags); extern void set_epoll_descriptor(int fd_epoll, int action, int fd_toadd, int events); -- 2.11.4.GIT