[tor-dev] Call for testing/review: obfsclient

[Yawning Angel]

On Fri, 14 Feb 2014 12:00:40 +0100
Fabian Keil <freebsd-listen at fabiankeil.de> wrote:

> Patch attached. Maybe client.cc should get its own #include, though.

Merged, it's fine to include there since some of the pts also use the
endian conversion macros.

> > Please let me know if it's still broken/if I've missed anything.
> from /home/fk/git/obfsclient/src/main.cc:49: /home/fk/git/obfsclient/src/schwanenlied/pt/scramblesuit/client.h:146:60:
> error: implicit instantiation of undefined template
> 'std::__1::array<unsigned char, 1448>' ::std::array<uint8_t,
> kHeaderLength + kMaxPayloadLength> decode_buf_;
> ^ /usr/include/c++/v1/__tuple:69:60: note: template is declared here
> template <class _Tp, size_t _Size> struct _LIBCPP_TYPE_VIS array; ^

This should also be fixed, left out #include <array> in
scramblesuit/client.h.

> In file included from /home/fk/git/obfsclient/src/main.cc:49:
> /home/fk/git/obfsclient/src/schwanenlied/pt/scramblesuit/client.h:64:14:
> error: static_cast from 'schwanenlied::pt::scramblesuit::Client *' to
> 'Socks5Server::Session *' is not allowed return
> static_cast<Socks5Server::Session*>(new Client(base, sock, addr,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2
> errors generated. *** Error code 1 [...]

Argh.  Ok, I think I know what the issue is, although it builds fine
with: 

somme :: Development/obfsclient/build ‹master*› % clang --version
clang version 3.4 (tags/RELEASE_34/final)
Target: x86_64-unknown-linux-gnu
Thread model: posix

Please try the attached patch and let me know if it's *still* broken.
If it works, I'll merge the change.

On a side note, tip of tree requires updating liballium since I
switched both of liballium and obfsclient to auto[conf/make]/libtool.
Hopefully the build process is less rage inducing now.

Apologies in advance for the inconvenience, and thanks for the changes
and your patience.

-- 
Yawning Angel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cast-fix.diff
Type: text/x-patch
Size: 5457 bytes
Desc: not available
URL: <http://lists.torproject.org/pipermail/tor-dev/attachments/20140214/cc51480f/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.torproject.org/pipermail/tor-dev/attachments/20140214/cc51480f/attachment.sig>