Commit Graph

2347 Commits

Author SHA1 Message Date
Thomas BERNARD 9a575da242
Merge pull request #727 from hebasto/240420-mingw-snprintf
Fix macro expression that guards `snprintf` for Windows
2024-04-21 14:29:39 +02:00
Hennadii Stepanov f70623c652
Fix macro expression that guards `snprintf` for Windows
Otherwise, the `snprintf` is still wrongly emulated for the following
cases:
 - mingw-w64 6.0.0 or new with ucrt
 - mingw-w64 8.0.0 or new with iso c ext
2024-04-20 16:35:06 +01:00
Thomas Bernard 74c5568d15 print empty string instead of null in ipv6 lease file
see #725
2024-04-18 00:58:45 +02:00
imEgo d0aca478d4 upnpc.c: Add -f option to upnpc program (delete multiple port redirections) 2024-04-03 20:50:56 +08:00
Thomas BERNARD db6f9968fe
Merge pull request #721 from fanquake/cmake_add_MINIUPNPC_GET_SRC_ADDR
build: add MINIUPNPC_GET_SRC_ADDR to CMake build
2024-03-23 21:33:04 +01:00
fanquake cb2026239c
build: add MINIUPNPC_GET_SRC_ADDR to CMake build
This mirrors the autotools build.
2024-03-22 14:03:54 +00:00
Thomas Bernard 7f189988a0 version 2.3.6 2024-03-20 00:41:25 +01:00
Thomas Bernard 6ce3b2eeda 2024 ;) 2024-03-20 00:37:33 +01:00
Thomas Bernard 7a3e256eb9 Merge branch 'master' of github.com:miniupnp/miniupnp 2024-03-20 00:28:27 +01:00
Thomas Bernard d4d5ec7d48 miniupnpc version 2.2.7 2024-03-20 00:27:28 +01:00
Thomas BERNARD 7333d00fa0
Merge pull request #718 from altendky/update_pip_for_wheel_build
update pip for wheel build
2024-03-20 00:12:21 +01:00
Thomas BERNARD fe806bc652
Merge pull request #720 from jimmy-park/fix-exe-target
cmake: don't add executable targets when `UPNPC_BUILD_SAMPLE` is `OFF`
2024-03-20 00:11:39 +01:00
Thomas Bernard daaaa60ce9 fix upnp_get_portmapping_number_of_entries() prototype ;) 2024-03-19 23:32:36 +01:00
Thomas Bernard 177c3ad915 Merge branch 'issue-663'
see https://github.com/miniupnp/miniupnp/pull/672
2024-03-19 23:12:03 +01:00
Jiwoo Park a424ee24f7
Don't add executable targets when UPNPC_BUILD_SAMPLE is OFF 2024-03-15 23:54:13 +09:00
Kyle Altendorf 8139341a39
update pip for wheel build 2024-03-12 21:03:17 -04:00
Kyle Altendorf dce79316fe
name tweak 2024-03-12 20:56:55 -04:00
Kyle Altendorf caddfd9e70
name tweak 2024-03-12 20:56:44 -04:00
Kyle Altendorf 813ca05045
name tweak 2024-03-12 20:56:30 -04:00
Kyle Altendorf a5b7529e59
correct upload job name 2024-03-12 20:55:12 -04:00
Kyle Altendorf 79206bd665
ls -la dist/ 2024-03-12 20:32:34 -04:00
Kyle Altendorf e6989a6464
enable verbose and print-hash 2024-03-12 20:31:41 -04:00
Kyle Altendorf 13c697bd23
add pypa/gh-action-pypi-publish 2024-03-12 20:27:02 -04:00
Kyle Altendorf f9b2857dce
build miniupnpc wheels in ci (#640)
* add miniupnpc_wheels_yml

* cp --recursive --verbose cloned/miniupnpc source

* --dereference

* reduce legibility to -RLv for macOS

* try qemu for linux aarch64

* use macos-latest for macOS ARM64 and cross build

* only setup qemu for linux

* skip install test for macos arm64 since we are cross building

* force all CIBW_ARCHS

* skip install test for all arm since we are cross building

* copy in actions

* setup for windows exclusion before merge

* add 3.12

* update from upstream

* macos arm runners, supposedly

* checkout before local actions

* cloned/

* _MACOS

* multiple cibuildwheel pins

* more cloned/

* exclude macos arm 3.7-3.9 due to python unavailability from github actions

* yup

* actions/setup-python@v5

* update pip

* maybe actually use qemu for linux arm

* oops

* more explicit in docker

* -m

* hmm

* aarch64

* aarch64 _and_ arm64

* ...

* try calling out os/arch labels for the runner

* Revert "try calling out os/arch labels for the runner"

This reverts commit 51f1f43e6b11b83433eb297a1ba0a15ef9e06702.

* add copyright and license notices

* exclude windows, cleanup
2024-03-13 01:09:47 +01:00
Thomas Bernard 4a041ccfda
Changelog for https://github.com/miniupnp/miniupnp/pull/672 2024-03-13 00:14:27 +01:00
Thomas Bernard ef5a1e1abc
testnftnlrdr.c: comments + debug output 2024-03-13 00:14:27 +01:00
Thomas Bernard 1bde68cc9e
nftpinhole.c: fix get_pinhole_info() to return the description
see #663
2024-03-13 00:14:27 +01:00
Thomas Bernard 358f430924
nftpinhole.c: update_pinhole() uses strchr() instead of strsep 2024-03-13 00:14:27 +01:00
Thomas Bernard c3f1a2cb30
always nul terminate string after strncpy()
see #663
2024-03-13 00:14:27 +01:00
Thomas Bernard 215091b546
nftpinhole.c: fix get_pinhole_info() and log inet_ntop() errors 2024-03-13 00:14:26 +01:00
Thomas Bernard 90fb7801eb
netfilter_nft: rule_t: have src/dst/nat addresses and ports
instead of guessing if it is remote host / external or internal address...
2024-03-13 00:14:20 +01:00
Thomas Bernard 25206a7a3f
testnftpinhole: call init_redirect() / shutdown_redirect() 2024-03-13 00:12:52 +01:00
Thomas Bernard b3b5dd16d2
more tests in testnftpinhole.c 2024-03-13 00:12:52 +01:00
Thomas Bernard 80d628fa59
netfilter_nft: improve testnftpinhole.c to test find_pinhole() 2024-03-13 00:12:51 +01:00
Thomas Bernard 2e7bfb1e31
netfilter_nft: change debug output for add_pinhole() 2024-03-13 00:12:51 +01:00
Thomas Bernard e2be9e1571
add comments to rule_set_filter6() and rule_set_filter_common() 2024-03-13 00:12:51 +01:00
Thomas Bernard 4c68985304
netfilter_nft/nftnlrdr_misc.c: comments and warning in parse_rule_payload() 2024-03-13 00:12:51 +01:00
Thomas Bernard 424f5c259f
fix find_pinhole()
see #663
2024-03-13 00:12:51 +01:00
Thomas Bernard 025f0f502b
NFT: check inet_pton() errors in find_pinhole() 2024-03-13 00:12:50 +01:00
Thomas Bernard 4dda6d8820
update (c) lines 2024-03-12 00:37:21 +01:00
Thomas Bernard 0648118563
build for python 3.11 as well 2024-03-06 00:37:10 +01:00
Thomas Bernard e086a24c88
Do not upload .egg to PyPI anymore
https://blog.pypi.org/posts/2023-06-26-deprecate-egg-uploads/
2024-03-05 22:53:36 +01:00
Thomas Bernard 9292d251ac
Changelog for https://github.com/miniupnp/miniupnp/pull/711
NFTables: add upnp_nftables_family_split option to use NFPROTO_IPV4/IPV6
instead of the generic NFPROTO_INET

thank you @svenauhagen
2024-03-05 22:52:20 +01:00
Thomas Bernard ba68624f55
Merge remote-tracking branch 'svenauhagen/feature/nftablesinit'
fixes #710

https://github.com/miniupnp/miniupnp/issues/710
https://github.com/miniupnp/miniupnp/pull/711
2024-03-05 00:33:12 +01:00
Sven Auhagen 2c9a645b10 NFTables: Add backwards compatibility for IPv4 NAT
NFtables uses the INET table for NAT which combines IPv4 and IPv6.
Older systems might not have this option and use the ip table instead.

This adds a flag to fall back to the ip table style.

Signed-Off-By: Sven Auhagen <sven.auhagen@voleatech.de>
2024-03-04 06:18:41 +01:00
Thomas Bernard cd7cbb59a3
miniupnpd version 2.3.5 2024-03-02 12:09:11 +01:00
Thomas Bernard 65a6cdb92e
miniupnpd: add miniupnpd version in XML descriptions
closes #709
2024-03-02 11:51:52 +01:00
Thomas Bernard 55e650b125
fix IGDv2 WANIPConnection XML service description for AddAnyPortMapping
out argument is NewReservedPort, not NewExternalPort.

Changelog + check precisely lenth of 12
2024-02-25 01:40:25 +01:00
Thomas Bernard f79e20d17d
miniupnpd: fix IGDv2 WANIPConnection XML service description
was :

<argument>
  <name>NewExternalPort</name>
  <direction>out</direction>
  <relatedStateVariable>ExternalPort</relatedStateVariable>
</argument>

Should be:

<argument>
  <name>NewReservedPort</name>
  <direction>out</direction>
  <relatedStateVariable>ExternalPort</relatedStateVariable>
</argument>

ExternalPort is 12 characters long !
fixes #708
2024-02-25 01:29:54 +01:00
Thomas Bernard 417ddcc3d3
miniupnpcstrings.h.cmake: use PROJECT_VERSION
that change was forgotten in ac5e908881

fixes #704
2024-02-03 12:10:26 +01:00