Merge pull request #226 from CESNET/pytrap_uriplist

Pytrap improved UnirecIPAddr and added UnirecIPList

Author: cejkato2

pytrap/Makefile.am

@@ -1,6 +1,17 @@
 .PHONY: rpm
 
-EXTRA_DIST=MANIFEST.in README README.md test.sh nemea-pytrap.spec setup.py src/pytrapmodule.c src/unirecmodule.c src/fields.c src/fields.h
+EXTRA_DIST=MANIFEST.in README README.md test.sh nemea-pytrap.spec setup.py \
+	   src/pytrapmodule.c \
+	   src/unirecmodule.c \
+	   src/unirecipaddr.c \
+	   src/unirecipaddr.h \
+	   src/unirecmacaddr.c \
+	   src/unirecmacaddr.h \
+	   src/unirectemplate.h \
+	   src/pytrapexceptions.h \
+	   src/iplist.c \
+	   src/iplist.h \
+	   src/fields.c src/fields.h
 
 rpm:
 	mkdir -p RPMBUILD/SOURCES

pytrap/nemea-pytrap.spec

@@ -6,8 +6,8 @@
 %endif
 
 Name:           %{pypi_name}
-Version:        0.16.0
-Release:        1%{?dist}
+Version:        0.17.0
+Release:        2%{?dist}
 Summary:        Python extension of the NEMEA project
 
 License:        BSD
@@ -55,5 +55,12 @@ TRAP_SOCKET_DIR=/tmp PAGER="" %{__python3} setup.py test
 %{python3_sitearch}/*
 
 %changelog
+* Fri Jul 26 2024 Tomas Cejka <[email protected]> - 0.17.0
+- Add UnirecIPList() for lookup IPs in the list of IP prefixes
+- Add UnirecIPAddr.from_ipaddress() to load from python ipaddress
+- Add UnirecIPAddrRange.from_ipaddress() to load from python ipaddress
+- Add UnirecIPAddr.to_ipaddress() for convertion to python ipaddress
+- Add UnirecIPAddrRange.to_ipaddress() for convertion to python ipaddress
 * Thu Jul 21 2016 root - 0.9.6-1
 - Initial package.
+

pytrap/setup.py

@@ -4,7 +4,7 @@
 SRC_PATH = os.path.relpath(os.path.join(os.path.dirname(__file__), ".", "src"))
 
 name = 'nemea-pytrap'
-version = '0.16.0'
+version = '0.17.0'
 release = version
 description = 'Python extension of the NEMEA project.'
 long_description = 'The pytrap module is a native Python extension that allows for writing NEMEA modules in Python.'
@@ -14,7 +14,9 @@
 maintainer_email = '[email protected]'
 
 pytrapmodule = Extension('pytrap.pytrap',
-                    sources = ['src/pytrapmodule.c', 'src/unirecmodule.c', 'src/unirecipaddr.c', 'src/unirecmacaddr.c', 'src/fields.c'],
+                    sources = ['src/pytrapmodule.c', 'src/unirecmodule.c',
+                        'src/unirecipaddr.c', 'src/unirecmacaddr.c',
+                        'src/iplist.c', 'src/fields.c'],
                     libraries = ['trap', 'unirec'])
 
 try: