Commit Graph

1300 Commits

Author SHA1 Message Date
Sean Reifschneider
5f6faaa5e8 Python send() with binary data
zts_py_send() was using strlen() to determine the length of the
send(). This works fine with strings, but fails with binary
data.

To fix this, I have removed the string encoding code, and
converted to using the Buffer protocol as is done in the
Python socketmodule send() implementation. This does mean
that this send() implementation only takes byte-like objects.

The workaround for this could be at the python level rather
than the C++ level.

NOTE: This implementation has a bug in the exception handling
if a non-bytes-like object is passed. You get an exception,
but the exception is not accurate, it reports the TypeError,
but the actual raised exception is due to there being a return
value when the error indicator is set. I spent a few hours
trying to fix this but was unable to. I'm afraid I just couldn't
figure it out.

My SSH proxy was misbehaving because the second block
of data going from the client to the server had a NUL byte as
the first byte to send, so the send was returning 0 bytes
sent, but that was due to send() being told to send 0 bytes.

With this, my SSH proxy is now working, including able to run
an rsync of my boot initrd over SSH over ZeroTier entirely in
userspace.
2021-03-20 13:01:50 -06:00
Joseph Henry
4b190ee384 Replace manual csc.exe invokation with dotnet project (for NuGet build) 2021-03-20 03:06:24 -07:00
Joseph Henry
42f188cdd6 Add NuGet package workflow 2021-03-19 23:11:45 -07:00
Joseph Henry
ea71b85627 Minor Windows build fixes 2021-03-19 22:57:21 -07:00
Joseph Henry
3aa402582f Remove out-of-place includes for signal handler functions 2021-03-19 22:33:15 -07:00
Sean Reifschneider
2ca8e01864 Fixing some bugs in socket blocking.
There were some bugs in my blocking code that are fixed in this.
I had the setblocking() flag reversed, and wasn't passing the
flag along to the underlying code properly.
2021-03-19 10:44:29 -06:00
Sean Reifschneider
14e70ec876 Assorted Python changes based on a code review.
Many changes were based on conventions in the Python socketmodule.

Changed many of the docstrings to match the Python socket library
conventions and enhancing them.  I can either remove the prototype
part or add it to other docstrings in the library, depending on
feedback I get.

Changed setblocking to use the flag argument instead of always
just setting NONBLOCK.

Added enable/disable threading around more lwip calls.

Implementing optional backlog on listen().

Removing a few seemingly unneeded Py_INCREF(Py_None) calls.

Moved getblocking function based on alpha sorting of names.
2021-03-18 22:55:37 -06:00
Joseph Henry
36256ea1b2 Update PyPI package build workflow to build Swig wrapper automatically 2021-03-17 18:50:45 -07:00
Joseph Henry
6d0b46a5c3 Update PyPI package version to 1.3.4b1 2021-03-17 14:57:06 -07:00
Joseph Henry
2e2a66c9f7 Move Python license into ext/THIRDPARTY.txt 2021-03-17 14:34:51 -07:00
Joseph Henry
73e26c1a79 Bugfix: Check argument types and encodings in zts_py_send() 2021-03-16 23:30:14 -07:00
Joseph Henry
9b79c2616d Merge branch 'linsomniac-py_recv_bytes' 2021-03-16 22:59:39 -07:00
Joseph Henry
bf1788919b Merge branch 'py_recv_bytes' of https://github.com/linsomniac/libzt into linsomniac-py_recv_bytes 2021-03-16 18:58:43 -07:00
Joseph Henry
ab32a827a4 Better random number generation in selftest 2021-03-16 18:02:13 -07:00
Sean Reifschneider
7dbf42d899 Attempt to fix zts_recv for Python.
There were a few I'm attempting to fix in zts_py_recv():

Was allocating a static buffer of 4096, but taking whatever
length the user passed in.  This change allocates a PyBytes
object of the size the user requests.

Was converting to a string without giving a size.  Which probably
led to the UnicodeDecodeError I was seeing below, trying to
decode a character beyond the received bytes.  Would also lead
to problems reading binary data that included embedded NULs.
Used the number of bytes received as the size of the returned data.

Variable "err" was being used, changed that to "bytes_read" as
that's what lwip_recv() returns, with <0 bytes read indicating
error.

Read data was being returned as a Unicode string, leading to this
response when I tried talking to my SSH server:

    UnicodeDecodeError: 'utf-8' codec can't decode
    byte 0xa1 in position 42: invalid start byte

My ssh banner is 40 bytes long, so I think position 42 was outside
the received buffer.  Changed it to a PyBytes response as is
normal for network data.  This code was cribbed from the Python
socketmodule

This was producing this error, as it was still returning the tuple:

    SystemError: <built-in function zts_py_recv> returned a
    result with an error set

This indicates that the UnicodeDecodeError had set an exception,
but a tuple was being returned instead of NULL.

In the case of a lwip_recv() error, the error response was not
being sent back to the wrapper code.  Instead, a "return NULL;"
was done.  I changed this case to return the tuple (err, None)
to the wrapper.

NOTE: this code built using "./build.sh host-python release", but
there was some sort of build problem I didn't understand which
produced a _libzt.so that I couldn't import, due to:

    ImportError: dynamic module does not define module export
    function (PyInit__libzt)

So I don't have a way to test these changes.
2021-03-16 15:52:55 -06:00
Joseph Henry
04c965f0e5 Buildfix: Missing type specifier 2021-03-16 14:42:59 -07:00
Joseph Henry
151b376539 Add libcurl4-gnutls-dev to selftest.yml 2021-03-16 14:27:24 -07:00
Joseph Henry
00b52d0910 Update version of libcurl used in Selftest workflow file from 3 to 4 2021-03-16 14:20:22 -07:00
Joseph Henry
1f981379ca Update Selftest workflow file 2021-03-16 14:18:36 -07:00
Joseph Henry
c5a31ba533 Attempt to circumvent GitHub's broken image caching service 2021-03-16 13:51:40 -07:00
Joseph Henry
b8c75c2d1b Add tests to selftest 2021-03-16 13:44:21 -07:00
Joseph Henry
d136d86263 Remove submodule (curl) 2021-03-16 13:00:41 -07:00
Joseph Henry
2c5c1a6a5f Expose lwIP's DNS API in zts_* API. Fix preprocessor build bug 2021-03-16 00:31:45 -07:00
Joseph Henry
2a515822c8 Remove networking functions that can be found elsewhere 2021-03-15 01:59:18 -07:00
Joseph Henry
986828a51f Split Java portion of socket API into its own file 2021-03-14 01:37:24 -08:00
Joseph Henry
4eb8304efe Change error behavior: Return ZTS_ERR_SERVICE in all cases before checking anything else 2021-03-14 01:02:43 -08:00
Joseph Henry
c220bb7d2f Improve Central API 2021-03-14 01:01:04 -08:00
Joseph Henry
26454d2939 Bugfix: calling zts_free() before zts_start() would enter infinite loop 2021-03-13 22:30:33 -08:00
Joseph Henry
575cfc364e Remove non-standard API function accept4() 2021-03-13 21:22:44 -08:00
Joseph Henry
9185af5426 Restore previous install behavior in CMakeLists 2021-03-13 18:05:25 -08:00
Joseph Henry
f4234fd1b0 Remove now-irrelevant makefile 2021-03-12 21:24:26 -08:00
Joseph Henry
07a5830302 Add Python extension module wrapper code 2021-03-12 21:17:37 -08:00
Joseph Henry
58ad7fafc0 Merge refactored dev into master 2021-03-12 20:32:08 -08:00
joseph-henry
4d5318800e Merge pull request #98 from erikh/fix-perms
Fix permissions on dist.sh
2021-03-12 20:26:16 -08:00
joseph-henry
b344b88a39 Merge pull request #99 from MoogleTroupe/c#-gc-fix
fix GC issue in c#
2021-03-12 20:25:32 -08:00
Joseph Henry
301cf9f41b Add GitHub workflow script to build Python wheels. Update PyPI package 2021-03-12 20:20:36 -08:00
Joseph Henry
0080bd0fdd Minor update to documentation 2021-03-10 11:20:00 -08:00
MoogleTroupe
5ba67d918d fix GC issue in c#
Store a reference to the unmanaged delegate so that the c# garbage collector doesn't wipe it out which causes a hard crash since the unmanaged dll is still referencing it.
2021-03-09 20:52:24 -05:00
Joseph Henry
dd6cf48d61 Run Python language bindings and example code through a linter and formatter 1.3.4 2021-03-07 21:11:21 -08:00
Joseph Henry
e1d0f92d61 Remove Android example. The Java example should suffice 2021-03-05 01:15:34 -08:00
Joseph Henry
5072d993b1 Implement more of the Python language binding. Minor adjustments to PyPI package 2021-03-05 00:18:11 -08:00
Joseph Henry
43ebeb2760 Update various READMEs 2021-03-05 00:07:54 -08:00
Joseph Henry
7bc690046a Add PyPI package (WIP) 2021-03-03 23:02:50 -08:00
Joseph Henry
9bca3270bc Overhaul build system and documentation 2021-03-02 01:53:03 -08:00
Joseph Henry
62354e142e Improvements to language binding facilities 2021-03-01 22:34:12 -08:00
Joseph Henry
66da0495a4 Change C# wrapper extension from cxx to cpp 2021-03-01 21:39:36 -08:00
Joseph Henry
64a0d5d0d7 Add working Python wrapper and examples (WIP) 2021-03-01 21:10:39 -08:00
Erik Hollensbe
ad68ded1d5 Fix permissions on dist.sh
They were 644 on my system

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
2021-02-28 01:13:01 -08:00
Joseph Henry
32da07ccb7 Remove unnecessary Android example project resource files 2021-02-24 01:30:23 -08:00
Joseph Henry
7a82ef4a03 Improvements to language binding facilities. Add custom signal handler 2021-02-24 01:25:15 -08:00