Просмотр исходного кода

Revert "[master] do res_init when interface is changed"

This reverts commit 8f5b4d9ee871fa9c8484e12a08ec15aa643f678d.

* We found this patch would have some side effect with specific DNS server.

Base on this patch:
http://gerrit.gemteks.com:8080/#/c/3936/

Change-Id: I7cd2f2a58f257e4c0f5ba8a78e33aabc79df9c16
leon_huang 10 лет назад
Родитель
Сommit
8aad77deed
4 измененных файлов с 3 добавлено и 15 удалено
  1. 1 1
      Makefile
  2. 0 2
      build-mac.sh
  3. 2 9
      lssdp.c
  4. 0 3
      test/Makefile

+ 1 - 1
Makefile

@@ -1,5 +1,5 @@
 all:
-	$(MAKE) -C test OSX=$(OSX)
+	$(MAKE) -C test
 
 clean:
 	rm -rf *.o

+ 0 - 2
build-mac.sh

@@ -1,2 +0,0 @@
-make clean
-make OSX=1

+ 2 - 9
lssdp.c

@@ -12,7 +12,6 @@
 #include <sys/socket.h> // struct sockaddr, AF_INET, SOL_SOCKET, socklen_t, setsockopt, socket, bind, sendto, recvfrom
 #include <netinet/in.h> // struct sockaddr_in, struct ip_mreq, INADDR_ANY, IPPROTO_IP, also include <sys/socket.h>
 #include <arpa/inet.h>  // inet_aton, inet_ntop, inet_addr, also include <netinet/in.h>
-#include <resolv.h>     // res_init, also include <arpa/nameser.h>
 #include "lssdp.h"
 
 #ifndef _SIZEOF_ADDR_IFREQ
@@ -194,16 +193,10 @@ end:
 
     /* Network Interface is changed */
 
-    // 1. reads the configuration files resolv.conf to get the default domain name, search order and name server address.
-    //    http://linux.die.net/man/3/res_init
-#if !defined(__ANDROID__) && !defined(__MAC__) && !defined(__IOS__)
-    res_init();
-#endif
-
-    // 2. force clean up neighbor_list
+    // 1. force clean up neighbor_list
     lssdp_neighbor_remove_all(lssdp);
 
-    // 3. invoke network interface changed callback
+    // 2. invoke network interface changed callback
     if (lssdp->network_interface_changed_callback != NULL) {
         lssdp->network_interface_changed_callback(lssdp);
     }

+ 0 - 3
test/Makefile

@@ -1,7 +1,4 @@
 CFLAGS = -g -Wall -I../
-ifdef OSX
-CFLAGS += -D__MAC__ -D__IOS__
-endif
 
 OBJS = ../lssdp.o