瀏覽代碼

misc/get_iface_info.h: add badvpn_ prefix to function

ambrop7 13 年之前
父節點
當前提交
efb684d588

+ 1 - 1
arpprobe/BArpProbe.c

@@ -262,7 +262,7 @@ int BArpProbe_Init (BArpProbe *o, const char *ifname, uint32_t addr, BReactor *r
     // get interface information
     int if_mtu;
     int if_index;
-    if (!get_iface_info(ifname, o->if_mac, &if_mtu, &if_index)) {
+    if (!badvpn_get_iface_info(ifname, o->if_mac, &if_mtu, &if_index)) {
         BLog(BLOG_ERROR, "failed to get interface information");
         goto fail0;
     }

+ 1 - 1
dhcpclient/BDHCPClient.c

@@ -135,7 +135,7 @@ int BDHCPClient_Init (BDHCPClient *o, const char *ifname, struct BDHCPClient_opt
     uint8_t if_mac[6];
     int if_mtu;
     int if_index;
-    if (!get_iface_info(ifname, if_mac, &if_mtu, &if_index)) {
+    if (!badvpn_get_iface_info(ifname, if_mac, &if_mtu, &if_index)) {
         BLog(BLOG_ERROR, "failed to get interface information");
         goto fail0;
     }

+ 1 - 1
examples/ncdinterfacemonitor_test.c

@@ -57,7 +57,7 @@ int main (int argc, char **argv)
     }
     
     int ifindex;
-    if (!get_iface_info(argv[1], NULL, NULL, &ifindex)) {
+    if (!badvpn_get_iface_info(argv[1], NULL, NULL, &ifindex)) {
         DEBUG("get_iface_info failed");
         goto fail0;
     }

+ 2 - 2
misc/get_iface_info.h

@@ -50,10 +50,10 @@
  * @param out_ifindex the interface index will be returned here, unless NULL
  * @return 1 on success, 0 on failure
  */
-static int get_iface_info (const char *ifname, uint8_t *out_mac, int *out_mtu, int *out_ifindex) WARN_UNUSED;
+static int badvpn_get_iface_info (const char *ifname, uint8_t *out_mac, int *out_mtu, int *out_ifindex) WARN_UNUSED;
 
 
-static int get_iface_info (const char *ifname, uint8_t *out_mac, int *out_mtu, int *out_ifindex)
+static int badvpn_get_iface_info (const char *ifname, uint8_t *out_mac, int *out_mtu, int *out_ifindex)
 {
     ASSERT(ifname)
     

+ 1 - 1
ncd/modules/net_backend_waitlink.c

@@ -100,7 +100,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
     
     // get interface index
     int ifindex;
-    int res = get_iface_info(ifname_nts.data, NULL, NULL, &ifindex);
+    int res = badvpn_get_iface_info(ifname_nts.data, NULL, NULL, &ifindex);
     NCDValNullTermString_Free(&ifname_nts);
     if (!res) {
         ModuleLog(o->i, BLOG_ERROR, "failed to get interface index");

+ 1 - 1
ncd/modules/net_ipv6_wait_dynamic_addr.c

@@ -116,7 +116,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
     
     // get interface index
     int ifindex;
-    int res = get_iface_info(ifname_nts.data, NULL, NULL, &ifindex);
+    int res = badvpn_get_iface_info(ifname_nts.data, NULL, NULL, &ifindex);
     NCDValNullTermString_Free(&ifname_nts);
     if (!res) {
         ModuleLog(o->i, BLOG_ERROR, "failed to get interface index");