Attachment #281541 for bug #376621

View | Details | Raw Unified | Return to bug 376621
Collapse All | Expand All

Lines 9-14 Link Here

(-)tor-0.2.3.2-alpha/configure.in (-3 / +12 lines)
9		9
10	AC_CANONICAL_HOST	10	AC_CANONICAL_HOST
11		11
		12	GENTOO_CFLAGS="$CFLAGS"
		13	GENTOO_LDFLAGS="$LDFLAGS"
		14	CFLAGS=
		15	LDFLAGS=
		16
12	if test -f /etc/redhat-release ; then	17	if test -f /etc/redhat-release ; then
13	if test -f /usr/kerberos/include ; then	18	if test -f /usr/kerberos/include ; then
14	CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"	19	CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
Lines 563-571 Link Here
563	[#include <miniupnpc/miniwget.h>	568	[#include <miniupnpc/miniwget.h>
564	#include <miniupnpc/miniupnpc.h>	569	#include <miniupnpc/miniupnpc.h>
565	#include <miniupnpc/upnpcommands.h>],	570	#include <miniupnpc/upnpcommands.h>],
566	[void upnpDiscover(int delay, const char * multicastif,	571	[upnpDiscover(int delay, const char * multicastif,
567	const char * minissdpdsock, int sameport);],	572	const char * minissdpdsock, int sameport,
568	[upnpDiscover(1, 0, 0, 0); exit(0);],	573	int ipv6,
		574	int * error);],
		575	[upnpDiscover(1, 0, 0, 0, 0, 0); exit(0);],
569	[--with-libminiupnpc-dir],	576	[--with-libminiupnpc-dir],
570	[/usr/lib/])	577	[/usr/lib/])
571	fi	578	fi
Lines 1211-1216 Link Here
1211		1218
1212		1219
1213	CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"	1220	CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
		1221	CFLAGS="$CFLAGS $GENTOO_CFLAGS"
		1222	LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
1214		1223
1215	AC_CONFIG_FILES([	1224	AC_CONFIG_FILES([
1216	Doxyfile	1225	Doxyfile

Lines 75-81 Link Here

(-)tor-0.2.3.2-alpha/src/tools/tor-fw-helper/tor-fw-helper-upnp.c (-2 / +2 lines)
75	memset(&(state->data), 0, sizeof(struct IGDdatas));	75	memset(&(state->data), 0, sizeof(struct IGDdatas));
76	state->init = 0;	76	state->init = 0;
77		77
78	devlist = upnpDiscover(UPNP_DISCOVER_TIMEOUT, NULL, NULL, 0);	78	devlist = upnpDiscover(UPNP_DISCOVER_TIMEOUT, NULL, NULL, 0, 0, NULL);
79	if (NULL == devlist) {	79	if (NULL == devlist) {
80	fprintf(stderr, "E: upnpDiscover returned: NULL\n");	80	fprintf(stderr, "E: upnpDiscover returned: NULL\n");
81	return UPNP_ERR_NODEVICESFOUND;	81	return UPNP_ERR_NODEVICESFOUND;
Lines 175-181 Link Here
175	r = UPNP_AddPortMapping(state->urls.controlURL,	175	r = UPNP_AddPortMapping(state->urls.controlURL,
176	state->data.first.servicetype,	176	state->data.first.servicetype,
177	external_port_str, internal_port_str,	177	external_port_str, internal_port_str,
178	state->lanaddr, UPNP_DESC, "TCP", 0);	178	state->lanaddr, UPNP_DESC, "TCP", 0, 0);
179	if (r != UPNPCOMMAND_SUCCESS)	179	if (r != UPNPCOMMAND_SUCCESS)
180	return UPNP_ERR_ADDPORTMAPPING;	180	return UPNP_ERR_ADDPORTMAPPING;
181		181

Return to bug 376621