d4af610c51
Merge branch 'master' into local_port
...
Conflicts:
miniupnpc/miniupnpc.c
miniupnpc/miniupnpc.h
miniupnpc/miniupnpcmodule.c
miniupnpc/upnpc.c
2015-10-08 17:42:45 +02:00
e1344f74aa
removed unused variable under win32
2015-09-16 00:12:35 +02:00
46f4679508
miniupnpc.c: clean #define's
2015-09-04 17:37:11 +02:00
2400d2f8d2
Merge branch 'refact_ssdpc'
...
Conflicts:
miniupnpc/miniupnpc.c
was because of aba8c3f3d7
2015-08-27 22:29:53 +02:00
d0c8154d74
miniupnpc.c: add minissdpd and discovered devices list
2015-08-27 22:22:35 +02:00
aba8c3f3d7
miniupnpc.c: use unsigned long for IP_MULTICAST_TTL with win32
...
fixes 1da63faa4f
2015-08-26 18:47:27 +02:00
fd8e8e7593
miniupnpc: Also accept "Up" as ConnectionStatus value
2015-08-16 22:10:48 +02:00
353f101655
Moved SSDP discovery code into minissdpc.c
2015-08-03 20:09:26 +03:00
fd65c0a9df
Moved UPNPDev definition to separate header.
2015-08-03 20:09:26 +03:00
1da63faa4f
miniupnpc: add ttl argument to upnpDiscover() functions
...
increments API_VERSION to 14
2015-07-23 22:44:37 +02:00
cffba15387
Split getDevicesFromMiniSSDPD into 4 steps to allow reuse of local socket.
...
It allows allows client application to use event loop instead of blocking
in read() while waiting for server reply.
2015-07-23 16:22:23 +03:00
2c56ffceeb
Fixed typo in setsockopt invocation which sets TTL.
2015-07-23 12:40:42 +03:00
af2ec81f14
Merge branch 'read_usn'
2015-07-22 23:50:44 +02:00
963eefcae5
miniupnpc.c: dont break if USN is not set
...
USN is mandatory, but don't break if the packet don't follow the standard and misses USN: header
2015-07-22 23:46:44 +02:00
151b16a1ed
miniupnpc.c: set multicast TTL to 2 by default
2015-07-22 15:00:01 +02:00
eb74f5c886
Read USN from SSDP messages.
2015-07-22 12:08:52 +03:00
e0999ace78
miniupnpc: Check malloc/calloc return values
...
fixes #136
2015-07-15 14:48:57 +02:00
27e2aa3841
miniupnpc: update getDevicesFromMiniSSDPD() to process longer minissdpd responses
2015-06-16 17:33:59 +02:00
eec3f12012
miniupnpc: minor code/comments modifications
2015-06-11 14:28:35 +02:00
76f52c81de
fixes 5c6a140098
2015-06-09 17:20:30 +02:00
a2adfcd05d
miniupnpc/miniupnpc.c: don't wait several times for the timeout in upnpDiscoverDevices()
2015-05-22 12:44:38 +02:00
0bf168d306
miniupnpc.c: minor comment reformatting
2015-05-22 12:27:38 +02:00
5c6a140098
miniupnpc: add searchalltypes param to upnpDiscoverDevices()
...
increase API_VERSION to 13
2015-05-22 12:25:51 +02:00
94a5af0c15
Allow user to explicitly specify local (source) port
...
See https://github.com/miniupnp/miniupnp/issues/119
- Replace the sameport parameter to the upnpDiscover* functions
- Added constants UPNP_LOCAL_PORT_ANY(0) & UPNP_LOCAL_PORT_SAME(1). The
value "1" was chosen for presumed backwards compatability with the
previous "sameport" parameter (assuming usesr would have set to 1 if
they wanted same port)
- Can be specified with "-z" to the test programs "upnpc" & "pymoduletest.py"
2015-05-12 19:05:48 -04:00
81dc08d290
Fix setsockopt() for IPV6_MULTICAST_IF
...
32bit: sizeof(&ifindex) == sizeof(void *) == 4
64bit: sizeof(&ifindex) == sizeof(void *) == 8
As a result, it is "ifindex" oob acces on 64bit platforms.
2015-01-21 16:44:36 +01:00
c72591e72e
miniupnpc/miniupnpc.c: fix compilation under WIN32
2014-12-01 10:31:50 +01:00
4cae31c948
miniupnpc.c: dont use if_indextoname() under MS Windows
...
fixes #85
2014-11-27 12:59:12 +01:00
3690785a79
miniupnpc/miniupnpc.c: accept all versions of urn:schemas-upnp-org:service:WANCommonInterfaceConfig: service
2014-11-18 00:01:48 +01:00
04b7126079
miniupnpc: fix LIBSPEC => MINIUPNP_LIBSPEC
2014-11-13 11:05:09 +01:00
9325bacbfc
Merge branch 'master' into search_all
...
Conflicts:
miniupnpc/.gitignore
miniupnpc/Makefile
miniupnpc/miniupnpc.c
2014-11-13 11:02:28 +01:00
edfd211276
miniupnpc/miniupnpc.c: simplified function GetUPNPUrls()
2014-11-05 07:09:42 +01:00
78d32ba012
Merge remote branch 'mikedld/remove-macosx-macro'
2014-06-16 10:54:03 +02:00
920845b107
Use built-in __APPLE__ macro instead of MACOSX
...
GCC and Clang on Mac OS have a built-in __APPLE__ macro. Use it instead of
manually-defined MACOSX.
2014-06-15 04:14:43 +03:00
011e7e7acd
Merge pull request #77 from mikedld/miniupnp-staticlib
...
Rename STATICLIB macro to resolve natpmp/miniupnp conflict
2014-06-02 18:54:33 +02:00
e222e50b24
miniupnpc: Compile with GNU/Hurd and GNU/kFreeBSD
2014-06-02 17:13:52 +02:00
2e4011ce33
Rename LIBSPEC macro to resolve natpmp/miniupnp conflict
...
Same macro name is used in both natpmp and miniupnp libraries so it's
impossble to link one statically and another dynamically. This patch
renames the macro to have library-specific name.
2014-06-01 13:35:13 +03:00
4e44ef642a
Merge branch 'master' into search_all
...
Conflicts:
miniupnpc/miniupnpc.c
2014-04-14 17:32:27 +02:00
ab7865ae99
miniupnpc.c: translate comment from French to English :)
2014-01-31 15:20:15 +01:00
bf3a91ba83
miniupnpc.c: added upnpDiscoverDevice()
2014-01-31 14:59:21 +01:00
18d54e2ae0
miniupnpc.c: MX cannot be 0
2013-12-13 12:50:25 +01:00
370d568715
Merge branch 'master' into search_all
2013-12-13 12:46:09 +01:00
6e20b2af61
miniupnpc.c: UPNP_GetValidIGD() now checks for ExternalIpAddress
2013-12-09 09:31:04 +01:00
b0c66c01e2
miniupnpc: define MAXHOSTNAMELEN if not already done
2013-12-09 09:31:04 +01:00
2ae481b969
some libc implementations don't define struct ip_mreqn
...
define it here if CFLAG passed with -DNEED_STRUCT_IP_MREQN
I found this issue cross compiling for ARM using eclibc in the
https://www.yoctoproject.org/ build system.
2013-11-15 10:42:27 +01:00
3e885191c0
miniupnpc.c: MX cannot be 0
2013-02-20 17:08:07 +01:00
91602e129d
miniupnpc.c: change upnpDiscoverDevice() to stop when devices are
2013-02-20 17:07:18 +01:00
cb054ef580
miniupnpc.c: add upnpDiscoverAll() function
2013-02-20 17:04:53 +01:00
09d5473c54
miniupnpc.c: reindent upnpDiscover()
2013-02-20 16:29:28 +01:00
2b9c014394
miniupnpc.c: improve debug output in upnpDiscoverDevices()
2013-02-20 16:12:35 +01:00
f9ea7ad372
upnpDiscover() => upnpDiscoverDevices()
2013-02-18 00:46:09 +01:00
Thomas Bernard
Konstantin Tokarev
Nevo Hed
Maks Naumov
Mike Gelfand
Karl Hiramoto