summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-07-01 10:28:43 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-07-01 10:30:06 +0200
commite3bd65b7eaa5b47b4029f92e909a6aae4fbdb152 (patch)
tree7ece8f21e7f63dbec3e32ba4ba1bee30f4a9b614
parentf6b2b535d482084e49ba8787973d8586ed51f563 (diff)
netsniff-ng: dev: Rename device_ifindex_get to __device_ifindex
Make the function name more in line with the scheme we use for other similar functions: the function prefixed with __ returns a negative error code, the function without prefix panic()'s on error. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r--dev.c4
-rw-r--r--dev.h2
-rw-r--r--mac80211.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/dev.c b/dev.c
index c28fa0e..20dfe17 100644
--- a/dev.c
+++ b/dev.c
@@ -14,7 +14,7 @@
#include "link.h"
#include "built_in.h"
-int device_ifindex_get(const char *ifname)
+int __device_ifindex(const char *ifname)
{
int ret, sock, index;
struct ifreq ifr;
@@ -40,7 +40,7 @@ int device_ifindex_get(const char *ifname)
int device_ifindex(const char *ifname)
{
- int index = device_ifindex_get(ifname);
+ int index = __device_ifindex(ifname);
if (unlikely(index < 0))
panic("Cannot get ifindex from device!\n");
diff --git a/dev.h b/dev.h
index 3c12d8c..a9e4ccf 100644
--- a/dev.h
+++ b/dev.h
@@ -6,8 +6,8 @@
extern size_t device_mtu(const char *ifname);
extern int device_address(const char *ifname, int af, struct sockaddr_storage *ss);
+extern int __device_ifindex(const char *ifname);
extern int device_ifindex(const char *ifname);
-extern int device_ifindex_get(const char *ifname);
extern int device_type(const char *ifname);
extern short device_get_flags(const char *ifname);
extern void device_set_flags(const char *ifname, const short flags);
diff --git a/mac80211.c b/mac80211.c
index ee81646..f22b600 100644
--- a/mac80211.c
+++ b/mac80211.c
@@ -227,7 +227,7 @@ void enter_rfmon_mac80211(const char *device, char **mondev)
slprintf(mondevice, sizeof(mondevice), "mon%u", n);
- if (device_ifindex_get(mondevice) > 0)
+ if (__device_ifindex(mondevice) > 0)
continue;
ret = nl80211_add_mon_if(&nlstate, device, mondevice);