Improvements in Python support and installation of Python and includes

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 37397eb..1679090 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -28,3 +28,5 @@ install(
     TARGETS tlspool_static
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
+
+add_subdirectory(python)

diff --git a/lib/python/CMakeLists.txt b/lib/python/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8ed9b1f
--- /dev/null
+++ b/lib/python/CMakeLists.txt
@@ -0,0 +1,13 @@
+# add_custom_target?
+# add_custom_command(TARGET libtlspool-python
+# POST_BUILD
+# COMMAND CFLAGS=I${CMAKE_SOURCE_DIR}/include python setup.py build)
+# 
+# add_dependencies
+
+# install(CODE "execute_process COMMAND CFLAGS=-I${CMAKE_SOURCE_DIR}/include python setup.py install")
+# install(CODE "execute_process(COMMAND CFLAGS=-I${CMAKE_SOURCE_DIR}/include python setup.py install)")
+install(CODE "execute_process(COMMAND python setup.py install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
+
+install(PROGRAMS webdemo.py
+       DESTINATION /usr/local/bin)

diff --git a/lib/python/webdemo.py b/lib/python/webdemo.py
index f46d1c0..7679ff2 100755 (executable)
--- a/lib/python/webdemo.py
+++ b/lib/python/webdemo.py
@@ -6,22 +6,27 @@ import socket
 sys.path.append ('.')
 import tlspool
 
-if len (sys.argv) == 2:
-       tlspool.open_poolhandle (sys.argv [1])
+if len (sys.argv) >= 2:
+    website = sys.argv [1]
+else:
+    website = 'nlnet.nl'
+
+if len (sys.argv) >= 3:
+       tlspool.open_poolhandle (sys.argv [2])
 
 sox = socket.socket (socket.AF_INET6, socket.SOCK_STREAM)
-sox.connect ( ('www.arpa2.net', 443) )
+sox.connect ( (website, 443) )
 
 cli2srv = (    tlspool.PIOF_STARTTLS_LOCALROLE_CLIENT |
                tlspool.PIOF_STARTTLS_REMOTEROLE_SERVER )
 cnx = tlspool.Connection (sox, service='http', flags=cli2srv)
 
 cnx.tlsdata.localid='testcli@tlspool.arpa2.lab'
-cnx.tlsdata.remoteid='www.arpa2.net'
+cnx.tlsdata.remoteid=website
 
 web = cnx.starttls ()
 
-web.send ('GET / HTTP/1.0\r\nHost: www.arpa2.net\r\n\r\n')
+web.send ('GET / HTTP/1.0\r\nHost: ' + website + '\r\n\r\n')
 
 dta = web.recv (4096)
 while dta != '':

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 948849d..cf41f13 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,3 +52,9 @@ install(
     TARGETS tlspool
     DESTINATION ${CMAKE_INSTALL_SBINDIR}
 )
+
+install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/include/tlspool/
+    DESTINATION /usr/include/tlspool
+)
+