commit 99f830de2f6006ccfd324548633c396d15b395a0
author shemminger <shemminger> Tue Jun 07 22:15:48 2005 +0000
committer shemminger <shemminger> Tue Jun 07 22:15:48 2005 +0000
tree 79b7f0adb4ce29cd96d2ce0187c3fb6620f6d854
parent 9bec1a436335457f3067a17de6ddb913bd95a184

Device indices are unsigned and use if_nametoindex as fallback

lib/ll_map.c

diff --git a/lib/ll_map.c b/lib/ll_map.c
index 89c0d20..1acbf8f 100644
--- a/lib/ll_map.c
+++ b/lib/ll_map.c
@@ -17,6 +17,7 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
 #include <string.h>
 
 #include "libnetlink.h"
@@ -25,7 +26,7 @@
 struct idxmap
 {
 	struct idxmap * next;
-	int		index;
+	unsigned	index;
 	int		type;
 	int		alen;
 	unsigned	flags;
@@ -86,7 +87,7 @@
 	return 0;
 }
 
-const char *ll_idx_n2a(int idx, char *buf)
+const char *ll_idx_n2a(unsigned idx, char *buf)
 {
 	struct idxmap *im;
 
@@ -100,14 +101,14 @@
 }
 
 
-const char *ll_index_to_name(int idx)
+const char *ll_index_to_name(unsigned idx)
 {
 	static char nbuf[16];
 
 	return ll_idx_n2a(idx, nbuf);
 }
 
-int ll_index_to_type(int idx)
+int ll_index_to_type(unsigned idx)
 {
 	struct idxmap *im;
 
@@ -119,7 +120,7 @@
 	return -1;
 }
 
-unsigned ll_index_to_flags(int idx)
+unsigned ll_index_to_flags(unsigned idx)
 {
 	struct idxmap *im;
 
@@ -132,7 +133,7 @@
 	return 0;
 }
 
-int ll_name_to_index(const char *name)
+unsigned ll_name_to_index(const char *name)
 {
 	static char ncache[16];
 	static int icache;
@@ -152,7 +153,8 @@
 			}
 		}
 	}
-	return 0;
+
+	return if_nametoindex(name);
 }
 
 int ll_init_map(struct rtnl_handle *rth)