PageRenderTime 2915ms CodeModel.GetById 27ms RepoModel.GetById 1ms app.codeStats 0ms

/user/miniupnpd/999-n56u.patch

https://bitbucket.org/altlc/wive-rtnl-ralink-rt305x-routers-firmware-amod
Patch | 671 lines | 632 code | 39 blank | 0 comment | 0 complexity | 508a02c42ee9172acf0097cf7df84f04 MD5 | raw file
Possible License(s): CC-BY-SA-3.0, BSD-3-Clause, MPL-2.0-no-copyleft-exception, GPL-2.0, GPL-3.0, LGPL-3.0, 0BSD, AGPL-1.0, LGPL-2.1, LGPL-2.0 
    

  1. diff -ur miniupnpd-1.7.20120824/genconfig.sh miniupnpd-1.7.20120824.b/genconfig.sh
    2. 

  2. --- miniupnpd-1.7.20120824/genconfig.sh	2012-07-11 06:24:52.000000000 +0800
    3. 

  3. +++ miniupnpd-1.7.20120824.b/genconfig.sh	2012-09-04 18:46:50.417238227 +0800
    4. 

  4. @@ -68,12 +68,15 @@
    5. 

  5.  	OS_VERSION="Tomato $(cat ../shared/tomato_version)"
    6. 

  6.  fi
    7. 

  7.  
    8. 

  8. +OS_NAME=Wive-NG-RTNL
    9. 

  9. +
    10. 

  10.  ${RM} ${CONFIGFILE}
    11. 

  11.  
    12. 

  12.  echo "/* MiniUPnP Project" >> ${CONFIGFILE}
    13. 

  13.  echo " * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/" >> ${CONFIGFILE}
    14. 

  14.  echo " * (c) 2006-2012 Thomas Bernard" >> ${CONFIGFILE}
    15. 

  15. -echo " * generated by $0 on `date`" >> ${CONFIGFILE}
    16. 

  16. +echo " * generated by $0 on `LC_ALL=C date -u`" >> ${CONFIGFILE}
    17. 

  17.  echo " * using command line options $* */" >> ${CONFIGFILE}
    18. 

  18.  echo "#ifndef $CONFIGMACRO" >> ${CONFIGFILE}
    19. 

  19.  echo "#define $CONFIGMACRO" >> ${CONFIGFILE}
    20. 

  20. @@ -259,6 +262,13 @@
    21. 

  21.  		echo "#endif" >> ${CONFIGFILE}
    22. 

  22.  		FW=netfilter
    23. 

  23.  		;;
    24. 

  24. +	RT-N56U)
    25. 

  25. +		OS_VERSION=1.1.2.3
    26. 

  26. +		OS_URL=http://code.google.com/p/rt-n56u/
    27. 

  27. +		echo "#define USE_NETFILTER 1" >> ${CONFIGFILE}
    28. 

  28. +		FW=netfilter
    29. 

  29. +		LEASEFILE=1
    30. 

  30. +		;;
    31. 

  31.  	Darwin)
    32. 

  32.  		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
    33. 

  33.  		FW=ipfw
    34. 

  34. @@ -326,9 +336,9 @@
    35. 

  35.  
    36. 

  36.  echo "/* Uncomment the following line to enable caching of results of" >> ${CONFIGFILE}
    37. 

  37.  echo " * the getifstats() function */" >> ${CONFIGFILE}
    38. 

  38. -echo "/*#define ENABLE_GETIFSTATS_CACHING*/" >> ${CONFIGFILE}
    39. 

  39. +echo "#define ENABLE_GETIFSTATS_CACHING" >> ${CONFIGFILE}
    40. 

  40.  echo "/* The cache duration is indicated in seconds */" >> ${CONFIGFILE}
    41. 

  41. -echo "#define GETIFSTATS_CACHING_DURATION 2" >> ${CONFIGFILE}
    42. 

  42. +echo "#define GETIFSTATS_CACHING_DURATION 3" >> ${CONFIGFILE}
    43. 

  43.  echo "" >> ${CONFIGFILE}
    44. 

  44.  
    45. 

  45.  echo "/* Uncomment the following line to enable multiple external ip support */" >> ${CONFIGFILE}
    46. 

  46. @@ -394,7 +404,7 @@
    47. 

  47.  echo "" >> ${CONFIGFILE}
    48. 

  48.  
    49. 

  49.  echo "/* include interface name in pf and ipf rules */" >> ${CONFIGFILE}
    50. 

  50. -echo "#define USE_IFNAME_IN_RULES" >> ${CONFIGFILE}
    51. 

  51. +echo "/*#define USE_IFNAME_IN_RULES*/" >> ${CONFIGFILE}
    52. 

  52.  echo "" >> ${CONFIGFILE}
    53. 

  53.  
    54. 

  54.  echo "/* Experimental NFQUEUE support. */" >> ${CONFIGFILE}
    55. 

  55. diff -ur miniupnpd-1.7.20120824/getifaddr.c miniupnpd-1.7.20120824.b/getifaddr.c
    56. 

  56. --- miniupnpd-1.7.20120824/getifaddr.c	2012-03-06 04:37:13.000000000 +0800
    57. 

  57. +++ miniupnpd-1.7.20120824.b/getifaddr.c	2012-09-04 19:51:03.410365520 +0800
    58. 

  58. @@ -36,30 +36,39 @@
    59. 

  59.  	int ifrlen;
    60. 

  60.  	struct sockaddr_in * addr;
    61. 

  61.  	ifrlen = sizeof(ifr);
    62. 

  62. +	int ret = -1;
    63. 

  63.  
    64. 

  64.  	if(!ifname || ifname[0]=='\0')
    65. 

  65.  		return -1;
    66. 

  66.  	s = socket(PF_INET, SOCK_DGRAM, 0);
    67. 

  67.  	if(s < 0)
    68. 

  68.  	{
    69. 

  69. -		syslog(LOG_ERR, "socket(PF_INET, SOCK_DGRAM): %m");
    70. 

  70. +		syslog(LOG_DEBUG, "socket(PF_INET, SOCK_DGRAM): %m");
    71. 

  71.  		return -1;
    72. 

  72.  	}
    73. 

  73.  	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
    74. 

  74. +	if(ioctl(s, SIOCGIFFLAGS, &ifr) < 0)
    75. 

  75. +	{
    76. 

  76. +		syslog(LOG_DEBUG, "ioctl(s, SIOCGIFFLAGS, ...): %m");
    77. 

  77. +		goto err;
    78. 

  78. +	} else
    79. 

  79. +	if ((ifr.ifr_flags & IFF_UP) == 0)
    80. 

  80. +		goto err;
    81. 

  81.  	if(ioctl(s, SIOCGIFADDR, &ifr, &ifrlen) < 0)
    82. 

  82.  	{
    83. 

  83. -		syslog(LOG_ERR, "ioctl(s, SIOCGIFADDR, ...): %m");
    84. 

  84. -		close(s);
    85. 

  85. -		return -1;
    86. 

  86. +		syslog(LOG_DEBUG, "ioctl(s, SIOCGIFADDR, ...): %m");
    87. 

  87. +		goto err;
    88. 

  88.  	}
    89. 

  89.  	addr = (struct sockaddr_in *)&ifr.ifr_addr;
    90. 

  90.  	if(!inet_ntop(AF_INET, &addr->sin_addr, buf, len))
    91. 

  91.  	{
    92. 

  92. -		syslog(LOG_ERR, "inet_ntop(): %m");
    93. 

  93. -		close(s);
    94. 

  94. -		return -1;
    95. 

  95. +		syslog(LOG_DEBUG, "inet_ntop(): %m");
    96. 

  96. +		goto err;
    97. 

  97.  	}
    98. 

  98.  	close(s);
    99. 

  99. +	ret = 0;
    100. 

  100. + err:
    101. 

  101. +	return ret;
    102. 

  102.  #else /* ifndef USE_GETIFADDRS */
    103. 

  103.  	/* Works for all address families (both ip v4 and ip v6) */
    104. 

  104.  	struct ifaddrs * ifap;
    105. 

  105. @@ -69,7 +78,7 @@
    106. 

  106.  		return -1;
    107. 

  107.  	if(getifaddrs(&ifap)<0)
    108. 

  108.  	{
    109. 

  109. -		syslog(LOG_ERR, "getifaddrs: %m");
    110. 

  110. +		syslog(LOG_DEBUG, "getifaddrs: %m");
    111. 

  111.  		return -1;
    112. 

  112.  	}
    113. 

  113.  	for(ife = ifap; ife; ife = ife->ifa_next)
    114. 

  114. @@ -95,8 +104,9 @@
    115. 

  115.  		}
    116. 

  116.  	}
    117. 

  117.  	freeifaddrs(ifap);
    118. 

  118. -#endif
    119. 

  119. +
    120. 

  120.  	return 0;
    121. 

  121. +#endif
    122. 

  122.  }
    123. 

  123.  
    124. 

  124.  #ifdef ENABLE_IPV6
    125. 

  125. @@ -115,7 +125,7 @@
    126. 

  126.  
    127. 

  127.  	if(getifaddrs(&ifap)<0)
    128. 

  128.  	{
    129. 

  129. -		syslog(LOG_ERR, "getifaddrs: %m");
    130. 

  130. +		syslog(LOG_DEBUG, "getifaddrs: %m");
    131. 

  131.  		return -1;
    132. 

  132.  	}
    133. 

  133.  	for(ife = ifap; ife; ife = ife->ifa_next)
    134. 

  134. diff -ur miniupnpd-1.7.20120824/linux/getifstats.c miniupnpd-1.7.20120824.b/linux/getifstats.c
    135. 

  135. --- miniupnpd-1.7.20120824/linux/getifstats.c	2012-04-07 01:47:58.000000000 +0800
    136. 

  136. +++ miniupnpd-1.7.20120824.b/linux/getifstats.c	2012-09-07 04:14:11.335411659 +0800
    137. 

  137. @@ -22,7 +22,9 @@
    138. 

  138.  	char * p;
    139. 

  139.  	int i;
    140. 

  140.  	int r = -1;
    141. 

  141. +#if 0
    142. 

  142.  	char fname[64];
    143. 

  143. +#endif
    144. 

  144.  #ifdef ENABLE_GETIFSTATS_CACHING
    145. 

  145.  	static time_t cache_timestamp = 0;
    146. 

  146.  	static struct ifdata cache_data;
    147. 

  147. @@ -86,7 +88,9 @@
    148. 

  148.  		break;
    149. 

  149.  	}
    150. 

  150.  	fclose(f);
    151. 

  151. +#if 0 /* Disable get speed. In 2.6.21 kernel not supported this. */
    152. 

  152.  	/* get interface speed */
    153. 

  153. +	/* NB! some interfaces, like ppp, don't support speed queries */
    154. 

  154.  	snprintf(fname, sizeof(fname), "/sys/class/net/%s/speed", ifname);
    155. 

  155.  	f = fopen(fname, "r");
    156. 

  156.  	if(f) {
    157. 

  157. @@ -96,9 +100,8 @@
    158. 

  158.  				data->baudrate = 1000000*i;
    159. 

  159.  		}
    160. 

  160.  		fclose(f);
    161. 

  161. -	} else {
    162. 

  162. -		syslog(LOG_WARNING, "cannot read %s file : %m", fname);
    163. 

  163.  	}
    164. 

  164. +#endif
    165. 

  165.  #ifdef ENABLE_GETIFSTATS_CACHING
    166. 

  166.  	if(r==0 && current_time!=((time_t)-1)) {
    167. 

  167.  		/* cache the new data */
    168. 

  168. diff -ur miniupnpd-1.7.20120824/Makefile.linux miniupnpd-1.7.20120824.b/Makefile.linux
    169. 

  169. --- miniupnpd-1.7.20120824/Makefile.linux	2012-08-25 02:14:23.000000000 +0800
    170. 

  170. +++ miniupnpd-1.7.20120824.b/Makefile.linux	2012-09-13 06:39:48.875968999 +0800
    171. 

  171. @@ -23,7 +23,6 @@
    172. 

  172.  #CFLAGS = -O -g -DDEBUG
    173. 

  173.  CFLAGS ?= -Os
    174. 

  174.  CFLAGS += -fno-strict-aliasing
    175. 

  175. -CFLAGS += -fno-common
    176. 

  176.  CFLAGS += -D_GNU_SOURCE
    177. 

  177.  CFLAGS += -Wall
    178. 

  178.  CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement
    179. 

  179. @@ -35,6 +34,22 @@
    180. 

  180.  STRIP ?= strip
    181. 

  181.  CP = cp
    182. 

  182.  
    183. 

  183. +CFLAGS += -ffunction-sections -fdata-sections
    184. 

  184. +LDFLAGS += -Wl,--gc-sections
    185. 

  185. +
    186. 

  186. +ifeq ($(KERNEL3X),y)
    187. 

  187. +LIBS = -lip4tc
    188. 

  188. +CFLAGS := $(CFLAGS) -DIPTABLES_143
    189. 

  189. +LDFLAGS := $(LDFLAGS) -lip4tc
    190. 

  190. +else
    191. 

  191. +IPTABLESPATH=../../iptables-1.3.x
    192. 

  192. +LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
    193. 

  193. +CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/
    194. 

  194. +LDFLAGS := $(LDFLAGS) -L$(IPTABLESPATH)/libiptc/
    195. 

  195. +endif
    196. 

  196.  
    197. 

  197.  INSTALLPREFIX ?= $(PREFIX)/usr
    198. 

  198.  SBININSTALLDIR = $(INSTALLPREFIX)/sbin
    199. 

  199. @@ -48,80 +63,15 @@
    200. 

  200.             upnpevents.o upnputils.o getconnstatus.o \
    201. 

  201.             upnppinhole.o
    202. 

  202.  
    203. 

  203. -LNXOBJS = linux/getifstats.o linux/ifacewatcher.o linux/getroute.o
    204. 

  204. +LNXOBJS = linux/getifstats.o linux/ifacewatcher.o
    205. 

  205.  NETFILTEROBJS = netfilter/iptcrdr.o netfilter/iptpinhole.o
    206. 

  206.  
    207. 

  207.  ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
    208. 

  208.  
    209. 

  209. -ifeq "$(wildcard /etc/gentoo-release )" ""
    210. 

  210. -LIBS ?= -liptc
    211. 

  211. -else # gentoo
    212. 

  212. -# the following is better, at least on gentoo with iptables 1.4.6
    213. 

  213. -# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618
    214. 

  214. -# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
    215. 

  215. -LIBS ?= -lip4tc
    216. 

  216. -CFLAGS := -DIPTABLES_143 $(CFLAGS)
    217. 

  217. -endif
    218. 

  218. -
    219. 

  219. -ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64)
    220. 

  220. -ifdef IPTABLESPATH
    221. 

  221. -CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/
    222. 

  222. -LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/
    223. 

  223. -# get iptables version and set IPTABLES_143 macro if needed
    224. 

  224. -ifeq ($(TARGET_OPENWRT),)
    225. 

  225. -IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 )
    226. 

  226. -IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
    227. 

  227. -IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
    228. 

  228. -IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
    229. 

  229. -# test if iptables version >= 1.4.3
    230. 

  230. -TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
    231. 

  231. -ifeq ($(TEST), 1)
    232. 

  232. -CFLAGS := $(CFLAGS) -DIPTABLES_143
    233. 

  233. -# the following sucks, but works
    234. 

  234. -LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
    235. 

  235. -#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
    236. 

  236. -else # ifeq ($(TEST), 1)
    237. 

  237. -LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
    238. 

  238. -endif # ifeq ($(TEST), 1)
    239. 

  239. -else # ($(TARGET_OPENWRT),)
    240. 

  240. -# openWRT :
    241. 

  241. -# check for system-wide iptables files. Test if iptables version >= 1.4.3
    242. 

  242. -# the following test has to be verified :
    243. 

  243. -TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1)
    244. 

  244. -ifeq ($(TEST), 1)
    245. 

  245. -CFLAGS := $(CFLAGS) -DIPTABLES_143
    246. 

  246. -LIBS = -liptc
    247. 

  247. -endif  # ($(TEST), 1)
    248. 

  248. -TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1)
    249. 

  249. -ifeq ($(TEST_LIB), 1)
    250. 

  250. -LIBS = -liptc /usr/lib$(ARCH)/libiptc.a
    251. 

  251. -endif # ($(TEST_LIB), 1)
    252. 

  252. -endif # ($(TARGET_OPENWRT),)
    253. 

  253. -else # ifdef IPTABLESPATH
    254. 

  254. -# IPTABLESPATH not defined
    255. 

  255. -# the following test has to be verified :
    256. 

  256. -TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1)
    257. 

  257. -ifeq ($(TEST), 1)
    258. 

  258. -CFLAGS := $(CFLAGS) -DIPTABLES_143
    259. 

  259. -LIBS = -liptc
    260. 

  260. -TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1)
    261. 

  261. -ifeq ($(TESTIP4TC), 1)
    262. 

  262. -LIBS := $(LIBS) -lip4tc
    263. 

  263. -endif # ($(TESTIP4TC), 1)
    264. 

  264. -TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1)
    265. 

  265. -ifeq ($(TESTIP6TC), 1)
    266. 

  266. -LIBS := $(LIBS) -lip6tc
    267. 

  267. -endif # ($(TESTIP6TC), 1)
    268. 

  268. -endif # ($(TEST), 1)
    269. 

  269. -endif # ifdef IPTABLESPATH
    270. 

  270. -
    271. 

  271. -LIBS += -lnfnetlink
    272. 

  272. -
    273. 

  273.  TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
    274. 

  274.  
    275. 

  275.  EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \
    276. 

  276. -              testupnppermissions miniupnpdctl testgetifaddr \
    277. 

  277. -              testgetroute
    278. 

  278. +              testupnppermissions miniupnpdctl testgetifaddr
    279. 

  279.  
    280. 

  280.  .PHONY:	all clean install depend genuuid
    281. 

  281.  
    282. 

  282. @@ -162,7 +112,7 @@
    283. 

  283.  	sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/genuuid||$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid) 2>/dev/null`/" miniupnpd.conf
    284. 

  284.  endif
    285. 

  285.  
    286. 

  286. -miniupnpd:	$(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS)
    287. 

  287. +miniupnpd:	$(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
    288. 

  288.  
    289. 

  289.  testupnpdescgen:	$(TESTUPNPDESCGENOBJS)
    290. 

  290.  
    291. 

  291. @@ -172,8 +122,6 @@
    292. 

  292.  
    293. 

  293.  testgetifaddr:	testgetifaddr.o getifaddr.o
    294. 

  294.  
    295. 

  295. -testgetroute:	testgetroute.o linux/getroute.o upnputils.o -lnfnetlink
    296. 

  296. -
    297. 

  297.  miniupnpdctl:	miniupnpdctl.o
    298. 

  298.  
    299. 

  299.  config.h:	genconfig.sh VERSION
    300. 

  300. diff -ur miniupnpd-1.7.20120824/minissdp.c miniupnpd-1.7.20120824.b/minissdp.c
    301. 

  301. --- miniupnpd-1.7.20120824/minissdp.c	2012-08-22 01:11:41.000000000 +0800
    302. 

  302. +++ miniupnpd-1.7.20120824.b/minissdp.c	2012-09-04 18:42:17.221295126 +0800
    303. 

  303. @@ -106,6 +106,7 @@
    304. 

  304.  	}
    305. 

  305.  
    306. 

  306.  	memset(&sockname, 0, sizeof(struct sockaddr_storage));
    307. 

  307. +#ifdef ENABLE_IPV6
    308. 

  308.  	if(ipv6) {
    309. 

  309.  		struct sockaddr_in6 * saddr = (struct sockaddr_in6 *)&sockname;
    310. 

  310.  		saddr->sin6_family = AF_INET6;
    311. 

  311. @@ -113,6 +114,7 @@
    312. 

  312.  		saddr->sin6_addr = in6addr_any;
    313. 

  313.  		sockname_len = sizeof(struct sockaddr_in6);
    314. 

  314.  	} else {
    315. 

  315. +#endif
    316. 

  316.  		struct sockaddr_in * saddr = (struct sockaddr_in *)&sockname;
    317. 

  317.  		saddr->sin_family = AF_INET;
    318. 

  318.  		saddr->sin_port = htons(SSDP_PORT);
    319. 

  319. @@ -121,7 +123,9 @@
    320. 

  320.  		saddr->sin_addr.s_addr = htonl(INADDR_ANY);
    321. 

  321.  		/*saddr->sin_addr.s_addr = inet_addr(ifaddr);*/
    322. 

  322.  		sockname_len = sizeof(struct sockaddr_in);
    323. 

  323. +#ifdef ENABLE_IPV6
    324. 

  324.  	}
    325. 

  325. +#endif
    326. 

  326.  
    327. 

  327.  	if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &j, sizeof(j)) < 0)
    328. 

  328.  	{
    329. 

  329. @@ -582,7 +586,8 @@
    330. 

  330.  				}
    331. 

  331.  				if (lan_addr == NULL)
    332. 

  332.  				{
    333. 

  333. -					syslog(LOG_ERR, "Can't find in which sub network the client is");
    334. 

  334. +					syslog(LOG_INFO, "Can't find in which sub network the client %s is",
    335. 

  335. +						sender_str);
    336. 

  336.  					return;
    337. 

  337.  				}
    338. 

  338.  				announced_host = lan_addr->str;
    339. 

  339. diff -ur miniupnpd-1.7.20120824/miniupnpd.c miniupnpd-1.7.20120824.b/miniupnpd.c
    340. 

  340. --- miniupnpd-1.7.20120824/miniupnpd.c	2012-08-22 01:11:41.000000000 +0800
    341. 

  341. +++ miniupnpd-1.7.20120824.b/miniupnpd.c	2012-09-04 18:42:17.221295126 +0800
    342. 

  342. @@ -1101,6 +1101,7 @@
    343. 

  343.  	}
    344. 

  344.  
    345. 

  345.  	openlog("miniupnpd", openlog_option, LOG_MINIUPNPD);
    346. 

  346. +	syslog(LOG_INFO, "version " MINIUPNPD_VERSION " started");
    347. 

  347.  
    348. 

  348.  	if(!debug_flag)
    349. 

  349.  	{
    350. 

  350. @@ -1448,6 +1449,9 @@
    351. 

  351.  			}
    352. 

  352.  #endif
    353. 

  353.  			should_send_public_address_change_notif = 0;
    354. 

  354. +#ifdef ENABLE_LEASEFILE
    355. 

  355. +			reload_from_lease_file();
    356. 

  356. +#endif
    357. 

  357.  		}
    358. 

  358.  		/* Check if we need to send SSDP NOTIFY messages and do it if
    359. 

  359.  		 * needed */
    360. 

  360. @@ -1759,7 +1763,7 @@
    361. 

  361.  			{
    362. 

  362.  				/* ignore EAGAIN, EWOULDBLOCK, EINTR, we just try again later */
    363. 

  363.  				if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR)
    364. 

  364. -					syslog(LOG_ERR, "accept(http): %m");
    365. 

  365. +					syslog(LOG_DEBUG, "accept(http): %m");
    366. 

  366.  			}
    367. 

  367.  			else
    368. 

  368.  			{
    369. 

  369. diff -ur miniupnpd-1.7.20120824/natpmp.c miniupnpd-1.7.20120824.b/natpmp.c
    370. 

  370. --- miniupnpd-1.7.20120824/natpmp.c	2012-05-28 07:12:51.000000000 +0800
    371. 

  371. +++ miniupnpd-1.7.20120824.b/natpmp.c	2012-09-04 18:42:17.221295126 +0800
    372. 

  372. @@ -97,7 +97,7 @@
    373. 

  373.  			resp[3] = 3;	/* Network Failure (e.g. NAT box itself
    374. 

  374.  			                 * has not obtained a DHCP lease) */
    375. 

  375.  		} else if(getifaddr(ext_if_name, tmp, INET_ADDRSTRLEN) < 0) {
    376. 

  376. -			syslog(LOG_ERR, "Failed to get IP for interface %s", ext_if_name);
    377. 

  377. +			syslog(LOG_DEBUG, "Failed to get IP for interface %s", ext_if_name);
    378. 

  378.  			resp[3] = 3;	/* Network Failure (e.g. NAT box itself
    379. 

  379.  			                 * has not obtained a DHCP lease) */
    380. 

  380.  		} else {
    381. 

  381. @@ -220,7 +220,7 @@
    382. 

  382.  							r = _upnp_delete_redir(eport2, proto2);
    383. 

  383.  							/* TODO : check return value */
    384. 

  384.  							if(r<0) {
    385. 

  385. -								syslog(LOG_ERR, "failed to remove port mapping");
    386. 

  386. +								syslog(LOG_DEBUG, "failed to remove port mapping");
    387. 

  387.  								index++;
    388. 

  388.  							} else {
    389. 

  389.  								syslog(LOG_INFO, "NAT-PMP %s port %hu mapping removed",
    390. 

  390. @@ -237,7 +237,7 @@
    391. 

  391.  					r = _upnp_delete_redir(eport, proto);
    392. 

  392.  					/*syslog(LOG_DEBUG, "%hu %d r=%d", eport, proto, r);*/
    393. 

  393.  					if(r<0) {
    394. 

  394. -						syslog(LOG_ERR, "Failed to remove NAT-PMP mapping eport %hu, protocol %s",
    395. 

  395. +						syslog(LOG_DEBUG, "Failed to remove NAT-PMP mapping eport %hu, protocol %s",
    396. 

  396.  						       eport, (proto==IPPROTO_TCP)?"TCP":"UDP");
    397. 

  397.  						resp[3] = 2;	/* Not Authorized/Refused */
    398. 

  398.  					}
    399. 

  399. @@ -259,7 +259,7 @@
    400. 

  400.  						       eport, (proto==IPPROTO_TCP)?"tcp":"udp", iaddr_old, iport_old);
    401. 

  401.  						/* remove and then add again */
    402. 

  402.  						if(_upnp_delete_redir(eport, proto) < 0) {
    403. 

  403. -							syslog(LOG_ERR, "failed to remove port mapping");
    404. 

  404. +							syslog(LOG_DEBUG, "failed to remove port mapping");
    405. 

  405.  							break;
    406. 

  406.  						}
    407. 

  407.  					} else {
    408. 

  408. @@ -282,7 +282,7 @@
    409. 

  409.  					if(upnp_redirect_internal(NULL, eport, senderaddrstr,
    410. 

  410.  					                          iport, proto, desc,
    411. 

  411.  					                          timestamp) < 0) {
    412. 

  412. -						syslog(LOG_ERR, "Failed to add NAT-PMP %hu %s->%s:%hu '%s'",
    413. 

  413. +						syslog(LOG_DEBUG, "Failed to add NAT-PMP %hu %s->%s:%hu '%s'",
    414. 

  414.  						       eport, (proto==IPPROTO_TCP)?"tcp":"udp", senderaddrstr, iport, desc);
    415. 

  415.  						resp[3] = 3;  /* Failure */
    416. 

  416.  #if 0
    417. 

  417. @@ -308,7 +308,7 @@
    418. 

  418.  	n = sendto(s, resp, resplen, 0,
    419. 

  419.  	           (struct sockaddr *)&senderaddr, sizeof(senderaddr));
    420. 

  420.  	if(n<0) {
    421. 

  421. -		syslog(LOG_ERR, "sendto(natpmp): %m");
    422. 

  422. +		syslog(LOG_DEBUG, "sendto(natpmp): %m");
    423. 

  423.  	} else if(n<resplen) {
    424. 

  424.  		syslog(LOG_ERR, "sendto(natpmp): sent only %d bytes out of %d",
    425. 

  425.  		       n, resplen);
    426. 

  426. diff -ur miniupnpd-1.7.20120824/netfilter/iptcrdr.c miniupnpd-1.7.20120824.b/netfilter/iptcrdr.c
    427. 

  427. --- miniupnpd-1.7.20120824/netfilter/iptcrdr.c	2012-05-01 17:11:16.000000000 +0800
    428. 

  428. +++ miniupnpd-1.7.20120824.b/netfilter/iptcrdr.c	2012-09-10 00:58:17.970067787 +0800
    429. 

  429. @@ -18,7 +18,7 @@
    430. 

  430.  
    431. 

  431.  #include <linux/version.h>
    432. 

  432.  
    433. 

  433. -#if IPTABLES_143
    434. 

  434. +#ifdef IPTABLES_143
    435. 

  435.  /* IPTABLES API version >= 1.4.3 */
    436. 

  436.  
    437. 

  437.  /* added in order to compile on gentoo :
    438. 

  438. @@ -40,7 +40,7 @@
    439. 

  439.  #else
    440. 

  440.  /* IPTABLES API version < 1.4.3 */
    441. 

  441.  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
    442. 

  442. -#include <linux/netfilter_ipv4/ip_nat.h>
    443. 

  443. +#include <linux/netfilter/nf_nat.h>
    444. 

  444.  #else
    445. 

  445.  #if 0
    446. 

  446.  #include <linux/netfilter/nf_nat.h>
    447. 

  447. diff -ur miniupnpd-1.7.20120824/upnpdescstrings.h miniupnpd-1.7.20120824.b/upnpdescstrings.h
    448. 

  448. --- miniupnpd-1.7.20120824/upnpdescstrings.h	2012-02-05 07:05:26.000000000 +0800
    449. 

  449. +++ miniupnpd-1.7.20120824.b/upnpdescstrings.h	2012-09-04 18:42:17.221295126 +0800
    450. 

  450. @@ -11,10 +11,10 @@
    451. 

  451.  
    452. 

  452.  /* strings used in the root device xml description */
    453. 

  453.  /*#define ROOTDEV_FRIENDLYNAME		OS_NAME " router"*/
    454. 

  454. -#define ROOTDEV_MANUFACTURER		OS_NAME
    455. 

  455. -#define ROOTDEV_MANUFACTURERURL		OS_URL
    456. 

  456. -#define ROOTDEV_MODELNAME			OS_NAME " router"
    457. 

  457. -#define ROOTDEV_MODELDESCRIPTION	OS_NAME " router"
    458. 

  458. +#define ROOTDEV_MANUFACTURER		"Wive-NG-RTNL"
    459. 

  459. +#define ROOTDEV_MANUFACTURERURL	"http://wive-ng.sourceforge.net/"
    460. 

  460. +#define ROOTDEV_MODELNAME		"Wireless Router"
    461. 

  461. +#define ROOTDEV_MODELDESCRIPTION	OS_NAME " Router"
    462. 

  462.  #define ROOTDEV_MODELURL			OS_URL
    463. 

  463.  
    464. 

  464.  #define WANDEV_FRIENDLYNAME			"WANDevice"
    465. 

  465. diff -ur miniupnpd-1.7.20120824/upnpevents.c miniupnpd-1.7.20120824.b/upnpevents.c
    466. 

  466. --- miniupnpd-1.7.20120824/upnpevents.c	2012-05-01 17:11:15.000000000 +0800
    467. 

  467. +++ miniupnpd-1.7.20120824.b/upnpevents.c	2012-09-04 18:42:17.221295126 +0800
    468. 

  468. @@ -376,7 +376,7 @@
    469. 

  469.  	i = send(obj->s, obj->buffer + obj->sent, obj->tosend - obj->sent, 0);
    470. 

  470.  	if(i<0) {
    471. 

  471.  		if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) {
    472. 

  472. -			syslog(LOG_NOTICE, "%s: send(): %m", "upnp_event_send");
    473. 

  473. +			syslog(LOG_DEBUG, "%s: send(): %m", "upnp_event_send");
    474. 

  474.  			obj->state = EError;
    475. 

  475.  			return;
    476. 

  476.  		} else {
    477. 

  477. @@ -400,7 +400,7 @@
    478. 

  478.  		if(errno != EAGAIN &&
    479. 

  479.  		   errno != EWOULDBLOCK &&
    480. 

  480.  		   errno != EINTR) {
    481. 

  481. -			syslog(LOG_ERR, "%s: recv(): %m", "upnp_event_recv");
    482. 

  482. +			syslog(LOG_DEBUG, "%s: recv(): %m", "upnp_event_recv");
    483. 

  483.  			obj->state = EError;
    484. 

  484.  		}
    485. 

  485.  		return;
    486. 

  486. diff -ur miniupnpd-1.7.20120824/upnpglobalvars.c miniupnpd-1.7.20120824.b/upnpglobalvars.c
    487. 

  487. --- miniupnpd-1.7.20120824/upnpglobalvars.c	2012-04-26 22:35:49.000000000 +0800
    488. 

  488. +++ miniupnpd-1.7.20120824.b/upnpglobalvars.c	2012-09-04 18:42:17.221295126 +0800
    489. 

  489. @@ -73,10 +73,10 @@
    490. 

  490.  #ifdef USE_NETFILTER
    491. 

  491.  /* chain name to use, both in the nat table
    492. 

  492.   * and the filter table */
    493. 

  493. -const char * miniupnpd_nat_chain = "MINIUPNPD";
    494. 

  494. -const char * miniupnpd_forward_chain = "MINIUPNPD";
    495. 

  495. +const char * miniupnpd_nat_chain = "UPNP";
    496. 

  496. +const char * miniupnpd_forward_chain = "UPNP";
    497. 

  497.  #ifdef ENABLE_6FC_SERVICE
    498. 

  498. -const char * miniupnpd_v6_filter_chain = "MINIUPNPD";
    499. 

  499. +const char * miniupnpd_v6_filter_chain = "UPNP";
    500. 

  500.  #endif
    501. 

  501.  
    502. 

  502.  #endif
    503. 

  503. diff -ur miniupnpd-1.7.20120824/upnphttp.c miniupnpd-1.7.20120824.b/upnphttp.c
    504. 

  504. --- miniupnpd-1.7.20120824/upnphttp.c	2012-05-28 21:26:58.000000000 +0800
    505. 

  505. +++ miniupnpd-1.7.20120824.b/upnphttp.c	2012-09-04 18:43:27.969838251 +0800
    506. 

  506. @@ -12,6 +12,7 @@
    507. 

  507.  #include <string.h>
    508. 

  508.  #include <sys/types.h>
    509. 

  509.  #include <sys/socket.h>
    510. 

  510. +#include <arpa/inet.h>
    511. 

  511.  #include <sys/param.h>
    512. 

  512.  #include <netinet/in.h>
    513. 

  513.  #include <arpa/inet.h>
    514. 

  514. @@ -514,7 +515,7 @@
    515. 

  515.  			return;
    516. 

  516.  		}
    517. 

  517.  #endif
    518. 

  518. -		syslog(LOG_NOTICE, "%s not found, responding ERROR 404", HttpUrl);
    519. 

  519. +		syslog(LOG_INFO, "%s not found, responding ERROR 404", HttpUrl);
    520. 

  520.  		Send404(h);
    521. 

  521.  	}
    522. 

  522.  #ifdef ENABLE_EVENTS
    523. 

  523. @@ -568,7 +569,8 @@
    524. 

  524.  		}
    525. 

  525.  		else if(n==0)
    526. 

  526.  		{
    527. 

  527. -			syslog(LOG_WARNING, "HTTP Connection closed unexpectedly");
    528. 

  528. +			syslog(LOG_WARNING, "HTTP Connection from %s closed unexpectedly",
    529. 

  529. +				inet_ntoa(h->clientaddr));
    530. 

  530.  			h->state = EToDelete;
    531. 

  531.  		}
    532. 

  532.  		else
    533. 

  533. @@ -604,7 +606,8 @@
    534. 

  534.  		}
    535. 

  535.  		else if(n==0)
    536. 

  536.  		{
    537. 

  537. -			syslog(LOG_WARNING, "HTTP Connection closed inexpectedly");
    538. 

  538. +			syslog(LOG_WARNING, "HTTP Connection from %s closed unexpectedly",
    539. 

  539. +				inet_ntoa(h->clientaddr));
    540. 

  540.  			h->state = EToDelete;
    541. 

  541.  		}
    542. 

  542.  		else
    543. 

  543. diff -ur miniupnpd-1.7.20120824/upnpredirect.c miniupnpd-1.7.20120824.b/upnpredirect.c
    544. 

  544. --- miniupnpd-1.7.20120824/upnpredirect.c	2012-05-02 04:11:50.000000000 +0800
    545. 

  545. +++ miniupnpd-1.7.20120824.b/upnpredirect.c	2012-09-04 18:42:17.221295126 +0800
    546. 

  546. @@ -165,7 +165,7 @@
    547. 

  547.  	if(!lease_file) return -1;
    548. 

  548.  	fd = fopen( lease_file, "r");
    549. 

  549.  	if (fd==NULL) {
    550. 

  550. -		syslog(LOG_ERR, "could not open lease file: %s", lease_file);
    551. 

  551. +		syslog(LOG_DEBUG, "could not open lease file: %s", lease_file);
    552. 

  552.  		return -1;
    553. 

  553.  	}
    554. 

  554.  	if(unlink(lease_file) < 0) {
    555. 

  555. @@ -287,14 +287,20 @@
    556. 

  556.  		 * xbox 360 does not keep track of the port it redirects and will
    557. 

  557.  		 * redirect another port when receiving ConflictInMappingEntry */
    558. 

  558.  		if(strcmp(iaddr, iaddr_old)==0 && iport==iport_old) {
    559. 

  559. -			syslog(LOG_INFO, "ignoring redirect request as it matches existing redirect");
    560. 

  560. +			/* redirection allready exists */
    561. 

  561. +			syslog(LOG_INFO, "port %hu %s already redirected to %s:%hu, replacing", eport, (proto==IPPROTO_TCP)?"tcp":"udp", iaddr_old, iport_old);
    562. 

  562. +			/* remove and then add again */
    563. 

  563. +			if(_upnp_delete_redir(eport, proto) < 0) {
    564. 

  564. +				syslog(LOG_ERR, "failed to remove port mapping");
    565. 

  565. +				return 0;
    566. 

  566. +			}
    567. 

  567.  		} else {
    568. 

  568.  
    569. 

  569.  			syslog(LOG_INFO, "port %hu protocol %s already redirected to %s:%hu",
    570. 

  570.  				eport, protocol, iaddr_old, iport_old);
    571. 

  571.  			return -2;
    572. 

  572.  		}
    573. 

  573. -	} else {
    574. 

  574. +	}
    575. 

  575.  		timestamp = (leaseduration > 0) ? time(NULL) + leaseduration : 0;
    576. 

  576.  		syslog(LOG_INFO, "redirecting port %hu to %s:%hu protocol %s for: %s",
    577. 

  577.  			eport, iaddr, iport, protocol, desc);
    578. 

  578. @@ -302,9 +308,6 @@
    579. 

  579.  		                              desc, timestamp);
    580. 

  580.  	}
    581. 

  581.  
    582. 

  582. -	return 0;
    583. 

  583. -}
    584. 

  584. -
    585. 

  585.  int
    586. 

  586.  upnp_redirect_internal(const char * rhost, unsigned short eport,
    587. 

  587.                         const char * iaddr, unsigned short iport,
    588. 

  588. @@ -511,7 +514,7 @@
    589. 

  589.  	{
    590. 

  590.  		if(tmp->to_remove)
    591. 

  591.  		{
    592. 

  592. -			syslog(LOG_NOTICE, "remove port mapping %hu %s because it has expired",
    593. 

  593. +			syslog(LOG_INFO, "remove port mapping %hu %s because it has expired",
    594. 

  594.  			       tmp->eport, (tmp->proto==IPPROTO_TCP)?"TCP":"UDP");
    595. 

  595.  			_upnp_delete_redir(tmp->eport, tmp->proto);
    596. 

  596.  			*p = tmp->next;
    597. 

  597. @@ -553,7 +556,7 @@
    598. 

  598.  		{
    599. 

  599.  			if(packets == list->packets && bytes == list->bytes)
    600. 

  600.  			{
    601. 

  601. -				_upnp_delete_redir(list->eport, list->proto);
    602. 

  602. +				if(_upnp_delete_redir(list->eport, list->proto) >= 0)
    603. 

  603.  				n++;
    604. 

  604.  			}
    605. 

  605.  		}
    606. 

  606. diff -ur miniupnpd-1.7.20120824/upnpsoap.c miniupnpd-1.7.20120824.b/upnpsoap.c
    607. 

  607. --- miniupnpd-1.7.20120824/upnpsoap.c	2012-05-25 02:05:47.000000000 +0800
    608. 

  608. +++ miniupnpd-1.7.20120824.b/upnpsoap.c	2012-09-04 18:42:17.221295126 +0800
    609. 

  609. @@ -271,7 +271,7 @@
    610. 

  610.  	}
    611. 

  611.  	else if(getifaddr(ext_if_name, ext_ip_addr, INET_ADDRSTRLEN) < 0)
    612. 

  612.  	{
    613. 

  613. -		syslog(LOG_ERR, "Failed to get ip address for interface %s",
    614. 

  614. +		syslog(LOG_DEBUG, "Failed to get ip address for interface %s",
    615. 

  615.  			ext_if_name);
    616. 

  616.  		strncpy(ext_ip_addr, "0.0.0.0", INET_ADDRSTRLEN);
    617. 

  617.  	}
    618. 

  618. @@ -355,7 +355,7 @@
    619. 

  619.  		}
    620. 

  620.  		else
    621. 

  621.  		{
    622. 

  622. -			syslog(LOG_ERR, "Failed to convert hostname '%s' to ip address", int_ip);
    623. 

  623. +			syslog(LOG_DEBUG, "Failed to convert hostname '%s' to ip address", int_ip);
    624. 

  624.  			ClearNameValueList(&data);
    625. 

  625.  			SoapError(h, 402, "Invalid Args");
    626. 

  626.  			return;
    627. 

  627. @@ -522,7 +522,7 @@
    628. 

  628.  		}
    629. 

  629.  		else
    630. 

  630.  		{
    631. 

  631. -			syslog(LOG_ERR, "Failed to convert hostname '%s' to ip address", int_ip);
    632. 

  632. +			syslog(LOG_DEBUG, "Failed to convert hostname '%s' to ip address", int_ip);
    633. 

  633.  			ClearNameValueList(&data);
    634. 

  634.  			SoapError(h, 402, "Invalid Args");
    635. 

  635.  			return;
    636. 

  636. @@ -1113,7 +1113,7 @@
    637. 

  637.  	}
    638. 

  638.  	else
    639. 

  639.  	{
    640. 

  640. -		syslog(LOG_NOTICE, "%s: Unknown: %s", action, var_name?var_name:"");
    641. 

  641. +		syslog(LOG_DEBUG, "%s: Unknown: %s", action, var_name?var_name:"");
    642. 

  642.  		SoapError(h, 404, "Invalid Var");
    643. 

  643.  	}
    644. 

  644.  
    645. 

  645. @@ -1246,7 +1246,7 @@
    646. 

  646.  		}
    647. 

  647.  		else
    648. 

  648.  		{
    649. 

  649. -			syslog(LOG_ERR, "Failed to convert hostname '%s' to ip address", int_ip);
    650. 

  650. +			syslog(LOG_DEBUG, "Failed to convert hostname '%s' to ip address", int_ip);
    651. 

  651.  			SoapError(h, 402, "Invalid Args");
    652. 

  652.  			return -1;
    653. 

  653.  		}
    654. 

  654. @@ -1836,7 +1836,7 @@
    655. 

  655.  			i++;
    656. 

  656.  		}
    657. 

  657.  
    658. 

  658. -		syslog(LOG_NOTICE, "SoapMethod: Unknown: %.*s", methodlen, p);
    659. 

  659. +		syslog(LOG_DEBUG, "SoapMethod: Unknown: %.*s", methodlen, p);
    660. 

  660.  	}
    661. 

  661.  
    662. 

  662.  	SoapError(h, 401, "Invalid Action");
    663. 

  663. @@ -1884,7 +1884,7 @@
    664. 

  664.  	char body[2048];
    665. 

  665.  	int bodylen;
    666. 

  666.  
    667. 

  667. -	syslog(LOG_INFO, "Returning UPnPError %d: %s", errCode, errDesc);
    668. 

  668. +	syslog(LOG_DEBUG, "Returning UPnPError %d: %s", errCode, errDesc);
    669. 

  669.  	bodylen = snprintf(body, sizeof(body), resp, errCode, errDesc);
    670. 

  670.  	BuildResp2_upnphttp(h, 500, "Internal Server Error", body, bodylen);
    671. 

  671.  	SendRespAndClose_upnphttp(h);
    672. 

  672.