Commit graph

266 commits

Author SHA1 Message Date
Romain GERARD
c30796dde0 Add Support for TLS 1.3
Former-commit-id: a137a97a2eee198af224f649d9a583965d19d7d4
Former-commit-id: 9959e6c092824cb6cda2e1a34d998a051921f54d [formerly 21db0555fa62a1417c32e2643b3930fbfbf782b0] [formerly 2b3c3465fb9d6de01f47ff1452a28d177f89f69c [formerly b5a72adeed14fa5186f7ec79c99234823eb53f06 [formerly b5a72adeed14fa5186f7ec79c99234823eb53f06 [formerly b5a72adeed14fa5186f7ec79c99234823eb53f06 [formerly 237d793fffe4ce05b8a0dd2490a6132b3fcf132e]]]]]
Former-commit-id: a6b5c1678673619a1f3a9cfcc226426e153b6596 [formerly 25a9a41fba724314423baa06e69eddec385bd29b]
Former-commit-id: c4fa74f3f3ac613787b0379d7c85c8341666f9e6
Former-commit-id: 4d0ecb4badf6ade0f8db7f09c6a005ece7818f83
Former-commit-id: 361f8af56bef5f164ab0b5391097d891fb15c99c
Former-commit-id: 19e1adbbec30af852428168ac7c1f6bce569e8ec [formerly bd6215392e7e581fe2c9efc8bfd4ed24c69368d7]
Former-commit-id: 7d968b29d1e39c0d2b0a7ff4651bf2b6e87592a2
2020-07-12 12:40:03 +02:00
Romain GERARD
abefd9cb44 #41 Add logging info when new ip connect to the server
+ Some linting fix


Former-commit-id: 78e8ad13287c3916dc363da0c20276937cd083bd
Former-commit-id: ef5e19d8f30f5038f96dadd7cfe344fbb4cbe842 [formerly 4fced1a153baaec01acdb9089be7347a4fdf7cd8] [formerly 43b403240f46e616637d11243b96793c0eca9ed7 [formerly 35aeae9b41abbedfd81b5b2f7de6609408536443 [formerly 35aeae9b41abbedfd81b5b2f7de6609408536443 [formerly 35aeae9b41abbedfd81b5b2f7de6609408536443 [formerly 5e7680c129ca27d9cf0aea32c56f5262aa187103]]]]]
Former-commit-id: 29c1b6ff7b1edc6ad066c5bf49c5e5d3f1dae524 [formerly 703efc9ce2bd6177b724ec5316d499f5a003e46a]
Former-commit-id: e4421ee34439ef05d1b1d4d6ca8daef8a256ed40
Former-commit-id: 69affb2d201ad218877e4226bf7f73bae04b25c3
Former-commit-id: a98a68f3939a0fe69b86c5a5704619e6eb84a3c8
Former-commit-id: 32ef81a31fb98402f19bdf10100b64bdc6a26f45 [formerly 7efac6c472c9ff67bbdab69e746e25027ab355f6]
Former-commit-id: 00fb5058bc3b013464ca82a19cae3e4dc29b89c3
2020-04-26 14:56:14 +02:00
Romain GÉRARD
0e51c51cfb Fix decoding error in socks5 proxy
Former-commit-id: 9251838d41ccb1e4806bc1450449ff2f4aeb0ad6
Former-commit-id: 7ee0bce8c007f91e0e313bf654217afe69702b70 [formerly d3f0883653a31df2eb6bc175c496251d0b2edea7] [formerly 5054071b3247e7ba1f04047d042ccff1dcfe5c70 [formerly 4016899bb03a38fc0b7c5888d8cd2ff30235e79d [formerly 4016899bb03a38fc0b7c5888d8cd2ff30235e79d [formerly 4016899bb03a38fc0b7c5888d8cd2ff30235e79d [formerly 4a5393b3b78ba039647a8bb9c920b4b1dec9c069]]]]]
Former-commit-id: 5a9ba40b828143d78d72992c0a5c7af4967eaffa [formerly 47aafb56d26a6d879d9d6cecf6fd7696809cca70]
Former-commit-id: 33174940425cb1a5bcefa5cc0b89ac795dbd29ce
Former-commit-id: b0e7b47cbca9ddc0e9b1e0502ecce96f719792fb
Former-commit-id: 04a32b4fec4bce8f6dc6e86ee1548c9798eb6b71
Former-commit-id: 3632695f26111d824378fb54dc63746e27f7d087 [formerly a2acc19e7c559a2a694ef9246dba5040d064ca60]
Former-commit-id: 1e692f7bee881d1981d9fa4153e697db0f0521c9
2020-02-24 21:17:35 +01:00
Romain GÉRARD
cce0c73296 Add tests
Former-commit-id: 784e7ccb82c0d876e4b7221799d76b7323fed37d
Former-commit-id: 2147af8d557978e41ac2b6cc8070e263b812f5af [formerly 409f5e7f3f1efaa572b5204734f7b98ba45691f8] [formerly 8ec0c0a6f589c7b550f84ca5f8413659dae0cec6 [formerly 75b709eacf85d0ec4510f1e92718613921d4f71e [formerly 75b709eacf85d0ec4510f1e92718613921d4f71e [formerly 75b709eacf85d0ec4510f1e92718613921d4f71e [formerly f30b98f39fbf0b640df77a3014419ffd2330a166]]]]]
Former-commit-id: d5a419daa10be6c65d58dcbd848e89eef5185c57 [formerly 2dfce717ba105274f52114e53fcb9e115782e8ea]
Former-commit-id: 0ee61f2da6b6fb2e67ca83e10110d8fc7471570f
Former-commit-id: 3ed9511801de3f101c54d40dafab73e3178f3bdb
Former-commit-id: a8cf76cf8663e8e052cae6e4302da48342cd394d
Former-commit-id: 0730d51e0fe05af0f7e21d66ab0029879afbfbe9 [formerly 1f4ce8c620ba9909e24757d90eebd189958a6299]
Former-commit-id: a8a721fe1165d376eeebe8f12ab62f5c0029a981
2020-02-24 20:57:42 +01:00
Romain GERARD
0a788ca3f7 Fix High CPU utilization #38
+ Properly notify that the stream is closed when there is no more data
  to read from the socket


Former-commit-id: 040b6f949d9f6751cdb626d080094ea359926d56
Former-commit-id: a13469bd6a307b44d8fb33085406a29755d98f61 [formerly adee22fb776a28d4746cd99fe5bd33699b2f46ce] [formerly a01daff330828687249cd040a74eb1bd66143c4d [formerly f79391c53820f0df1a4609ed01fdb5de68222f0b [formerly c358f0ababd30764b97017f12f4b508b04caf1de] [formerly be3e3e6f4b78ffd53b6a3ea67d3aa09bfab91f2b] [formerly be3e3e6f4b78ffd53b6a3ea67d3aa09bfab91f2b [formerly be3e3e6f4b78ffd53b6a3ea67d3aa09bfab91f2b [formerly b008128bf854a39bbc5c6abdc5fd87cc8e38fffe]]]]]
Former-commit-id: cf525aa4cde74e9d22826fc2fd46fc6f08ca478b [formerly 6751159b82b46bedef7fde04c0444c76d391bd99]
Former-commit-id: 9669125c02d8fdb2339cd927d28db7cdc0a60a58
Former-commit-id: e711b3a557f7b037794667c0b4249a21c44abc3f
Former-commit-id: eccc9eaf7007ec09119c4307389991d4d199f4b6
Former-commit-id: a6d5dd21c88508a5c8f2afd031852955cb45998d [formerly 3e1eca9a176bb75971f232a2dc0dc887e2dd1d31]
Former-commit-id: 053a1b7025f8cb4d6c67a648c15b66be18f1e9f0
2020-02-24 18:37:41 +01:00
Romain GÉRARD
b47a05449e Do not try to set SO_MARK when not specified #37
+ When SO_MARK is specified wstunnel need to be run as root or with
network capabilities in order to be able to use this socket option.
Sadly Haskell network setsocketoption does not return an error, not an
exception when we are not permitted to use it, it just crash the current
thread without any warning ...


Former-commit-id: 5e1b790af4f08c95716420873dc858afeb4f00aa
Former-commit-id: 39ab9a3fef5159e0db1568be173a843570427d75 [formerly 88472e1ae8441ded76d4f32ed66d548a5e621dc4] [formerly 45f1cee434ff4e5cd30a8f4d7e86097748458fda [formerly a83e83038640a9742b65ece60a5653a74a822040 [formerly a83e83038640a9742b65ece60a5653a74a822040 [formerly a83e83038640a9742b65ece60a5653a74a822040 [formerly 68b6d92dc389ca83b3cd89b8eb8790d928997d29]]]]]
Former-commit-id: 046192c196f735cd53a78ece9371f418745cd763 [formerly aaa97f4c0ce70e4b7ae2d25a3e6dfb32e6aaf0cb]
Former-commit-id: d303425ad3e558ebfcc635f8f8925d70e3eaff6f
Former-commit-id: d103c22adea13872a08c2c6aa1e967f7372006af
Former-commit-id: 547aff025dd8c65133214c4b716c9d4920f9cc89
Former-commit-id: 29062a1856573bb3ab86d80f682cfa354792cb2a [formerly 722b724cebdc71a4f4e360a8a9f782e9e9a198f6]
Former-commit-id: 796475dc5641218f0d3af5a90c6ee1141cc3f553
2020-02-22 13:53:54 +01:00
Erèbe - Romain Gerard
2f48c7b95d Add SO_MARK support (#34)
* Add SO_MARK support

* SO_MARK is now parametable


Former-commit-id: d3a8db61378688b10741e37e9750962250d5b413
Former-commit-id: 3f2cfb1cf7bf25b7e98b908d7962c0d04c87b173 [formerly 4d7672c8b097390de2d4789a3612a7acdb251563] [formerly 84f02bd794a524c46a3303851b9090178c07e315 [formerly cc09d795159786b36d9e9f5ab48c92260cd0cdf5 [formerly cc09d795159786b36d9e9f5ab48c92260cd0cdf5 [formerly cc09d795159786b36d9e9f5ab48c92260cd0cdf5 [formerly 603b65e7d9fdd0aa421ef2cf5f8684eaca044dc0]]]]]
Former-commit-id: cf75e5c7a77085f4c4bfce4da8c01ab9dcd94edf [formerly 4033012e5f39470e3c08b8918f686afe3dfb0200]
Former-commit-id: a903f60697af67855408554260028dbea6fade14
Former-commit-id: 3115a5bc330ac8708eda9430b6f85ef5a0a8d1ce
Former-commit-id: 6b2ba8627004dd0c916ecdaf9aea9cebb6de312e
Former-commit-id: 5f65ff28217d015ac6a76a0803e677ac728563e4 [formerly 677120e2a339cc83c420f12354fbc4b1e3f7d91e]
Former-commit-id: 0a91ab53293d5383b251f470962b640126dea526
2020-01-22 19:04:07 +01:00
Romain GERARD
3d0b3383e9 Parse ipv6 for tunnelinfo and server info command line
Former-commit-id: d7bcced397720389fb4da443ddd941831513b337
Former-commit-id: b7149720d33e78efd5455744a97d8f1a44b3a0f0 [formerly 36a0a27cfcb71103e448f59798e7a94e695134fe] [formerly 0a6f2fd33a77e7af032ebbb2f5d20c90515d678e [formerly a01c762112ae5e08e25ff0b55d5cb8b543be7d88 [formerly a01c762112ae5e08e25ff0b55d5cb8b543be7d88 [formerly a01c762112ae5e08e25ff0b55d5cb8b543be7d88 [formerly dd1f0518c5440a2e1a390773fadfc6d7965fa4a8]]]]]
Former-commit-id: 0ba7fc235b47ce11f95c838d4ff1b0ea396fef9c [formerly 7e47b8adcb79aba97189a9e99083d266a258a336]
Former-commit-id: d9d60c9432d6a2ea42db3d1f63542a93b7185ed5
Former-commit-id: f3371f67d2e2a1cb8e366c6d98309c567c9b7225
Former-commit-id: dcadeb51e476ba89773351476ebb0bad1b44400d
Former-commit-id: 61f7fcf1a8c815013fda41321ea240e309a7cc87 [formerly 4d19a57259fe8c341f5f76016d5cbe3a33494874]
Former-commit-id: 53d69bcf8a69464e3e0d53a1d6c6b79c2d718da8
2020-01-04 17:57:18 +01:00
Romain GERARD
8ca1ed9fb3 Perf improvements: Use default os setting for socket recv buffer size
+ This commit 8e38589efb (diff-8c54fc2d40ad45803c6889efbb0192bbR278) introduce a default fixed size read buffer which is too low for most modern system. Thus it induce a lot of unecessary syscall and cpu usage.
  Use the default OS settings in order to let the user control it with
  ie: /proc/sys/net/ipv4/tcp_rmem


Former-commit-id: 1fc22266bf6cda96ec8c43b52cc6da527db35173
Former-commit-id: f9cbaa2ce612df6cbfc88963a32b0a0e38c1e13e [formerly 18c0558ec79d6a82ef242b114a63738a81329ec5] [formerly 5aa78fa4a16ac891f169a02275d147ec12fc336f [formerly 32204a8d46a8f4d06e40c15380e68afa4dd1f294 [formerly 32204a8d46a8f4d06e40c15380e68afa4dd1f294 [formerly 32204a8d46a8f4d06e40c15380e68afa4dd1f294 [formerly 11e560d1fae42a64cd645e79343209e6559473d9]]]]]
Former-commit-id: 8e4ccba7062154cdaba142c6110b32b05ca08e37 [formerly a7d2f3299f4c67ea0ec9d20cbf2780382258e143]
Former-commit-id: c9ebc4a70b48e7433d65af79ef161d2b0d510f61
Former-commit-id: b5056ca3dda1f23f3bc5d8e093772874b5666fbb
Former-commit-id: 7a25a6703c1c0396425d40f4080162b43179b96d
Former-commit-id: c6d4da14dfcbb373dcb3341f246bd6675f44e4e7 [formerly 5f081b250a55f9fa091a8f13927e4c2d7980ef2a]
Former-commit-id: 886b1fa73005e8167949ede1391086d3f6ed3e00
2020-01-04 15:43:05 +01:00
Romain GERARD
df927db68e Perf improvements: Use default os setting for socket recv buffer size
+ This commit 8e38589efb (diff-8c54fc2d40ad45803c6889efbb0192bbR278) introduce a default fixed size read buffer which is too low for most modern system. Thus it induce a lot of unecessary syscall and cpu usage.
  Use the default OS settings in order to let the user control it with
  ie: /proc/sys/net/ipv4/tcp_rmem


Former-commit-id: 11329e7b2d39a571afcfa1c41b36ca43b8c6ee0c
Former-commit-id: d125be3860d756e8608707db387b9293005d02f8 [formerly cc16d8a3c00a1f2ae215b44b94356f0fd9b06abc] [formerly a4977ba6a35eb7805b01eb9b628786e22842f480 [formerly fd3d401b93d75acf5a20d37598cf115d234b47ad [formerly fd3d401b93d75acf5a20d37598cf115d234b47ad [formerly fd3d401b93d75acf5a20d37598cf115d234b47ad [formerly bec6f99d38ff1e9c53a0a7d71ae6051280508d2e]]]]]
Former-commit-id: 18d8b263236b960c37a41e63491bc287bf584a67 [formerly 9d2ab35501de57b0ba1ee8d18f1fb173a3ca98f6]
Former-commit-id: 00bdbc5e1cd318896a012b76dfdc68964434b43d
Former-commit-id: 86df02c0670359a2bb2429eae4b9b633f5d520ef
Former-commit-id: 59966a7acefbbdc76e580d281f8be7ee2ca1db03
Former-commit-id: d670c023b29c085d4e76809ec539fcd91d6be993 [formerly 2bfa1100e83fd689dd2e2c565fe0838036c1b588]
Former-commit-id: c7c40b2a4e933cbff27713a87d7cc701c1279d32
2020-01-04 13:29:50 +01:00
Romain GÉRARD
e3c9462b6b Update dependencies
Former-commit-id: 07be9bcd252c92551aeac5c658f92f74243105e1
Former-commit-id: b341e9cf83887e8916850743b19530e2ae62bedc [formerly b0dd237c1af7232c65504086f32c543e2969f21c] [formerly 5f84fe76bfaf2ea3150d2524b2d8df3bcc202b42 [formerly df2a945ea4f815d78825bbd6eb47355fa7862146 [formerly df2a945ea4f815d78825bbd6eb47355fa7862146 [formerly df2a945ea4f815d78825bbd6eb47355fa7862146 [formerly f3baa2138e3ecd75e07adaa8e8390e0d1d3eeed6]]]]]
Former-commit-id: 5a12d3b8f84beb6967fd2273700830e11a919dcb [formerly 23f65ae564b717c82f4f878bebcfb23696470c28]
Former-commit-id: c2dda31dea3d0634127eb6fb4b2557d41c8ee442
Former-commit-id: 886a28263ded5e3f13a642e8739eb4f83c0615f3
Former-commit-id: 937d535ef551e00fe83c69c16f715cd71ebda6dd
Former-commit-id: 4aae739c2c9a054011d743112ab937f750c179c2 [formerly 6a87e7206c043684e0f0c5acf8d83cd5bcfb6014]
Former-commit-id: 58fbcd0de59b4c8ff87286b9b61e90425df334bb
2019-10-24 13:46:58 +02:00
Romain GÉRARD
95a30e712d Allow udp timeout to be specified by the command line
Former-commit-id: 5ba73def38dc116dfc887c25293f8d1dddcd7d0f
Former-commit-id: 09f35f66523a05d69c3d1f864577cc0d6e3489e0 [formerly 965739217f9a07297608dc0b1380b17fa44cd850] [formerly 155253d91655a690b04e5a5801e730af02969673 [formerly 013ca92ae8219e8406cb590ee377fbeaf05c9034 [formerly 013ca92ae8219e8406cb590ee377fbeaf05c9034 [formerly 013ca92ae8219e8406cb590ee377fbeaf05c9034 [formerly c349bdfd8cfd7ff3db5aba7a2c86a16ce8bc13bd]]]]]
Former-commit-id: dc66326fecbfad906e3aadd919c3088bbb724c8c [formerly 8707222b86f066548e3294c402b0225c7db8873a]
Former-commit-id: 4e6f916b34f9f674a90e5b372fe8ebaae7befa8f
Former-commit-id: 95c3ae306b73baa7c6feaacc9c24a6dce4cee15b
Former-commit-id: 2aeca4033fa6611c876e6f64f73adbe7d4ae2a89
Former-commit-id: 28c045517c23a9250fcddad4925a0580201b2700 [formerly 8928f8ea077e8610fc6602ef3a9a356940562f64]
Former-commit-id: 7aaa22e3b15b4c896039036b4178703c320d0028
2019-01-13 17:47:18 +01:00
Romain GÉRARD
b39ce96b5e Add support for forwarding data from stdio #13
Former-commit-id: 14e64f7856faa8b9dba9863b9c19cb4c946ec59a
Former-commit-id: 7da75567618986cabb6988c21e121875c1ad3c1a [formerly a2e77352c857e68e01d12391baf08d3479fd12fe] [formerly f1faa58016cca590bfc52e1ef3f791fc6d0eeccc [formerly fcc6b7ecbd00c933d564805d4adf2e9114bfc6d5 [formerly 30e36d272030b305c561984fe353a1ba2b0db62e] [formerly fcc6b7ecbd00c933d564805d4adf2e9114bfc6d5 [formerly 30e36d272030b305c561984fe353a1ba2b0db62e] [formerly 30e36d272030b305c561984fe353a1ba2b0db62e [formerly adb6021118db2efa77278f15d3523b9ee75a84b3]]]]]
Former-commit-id: fe2e93e58fbbf425c02ccf85bb56ec7119ea365e [formerly ab0492da6e9e63a2f7357eef20e5b43dbc0df810]
Former-commit-id: d9a120c7e6cfb38b3dcb73c5fdb27492f587fbb8
Former-commit-id: e7e62bedc379e337d945fba8e0fc8abe86f7f000
Former-commit-id: 12e2067cf1471e6a5469eb5bdde21a711d6f79e9
Former-commit-id: bd45b8e3895b005582eb0f636206b3265e0cfd78 [formerly 4f169fede9f7d60e38960e640c741c2958fd4830]
Former-commit-id: 0ddce8e35b6f8ada2166916cd66166bc36af75d4
2018-12-28 09:50:52 +01:00
Romain GÉRARD
22fd71260f Add customizable prefix in the path during upgrade request
Former-commit-id: c16207bd96144376e8429266a2d61df92bc1e5b2
Former-commit-id: 578fff43ac8380458056dcb1e4369252c7e125ff [formerly d122fbc99209873bb7eb2e55e73ac7f5da232155] [formerly 8252d74f5e89f5fbbc27ac6470c2fc63c7afad5a [formerly 1db2611b1212d71369506ab3016f8426b4ad6bd5 [formerly 1db2611b1212d71369506ab3016f8426b4ad6bd5 [formerly 1db2611b1212d71369506ab3016f8426b4ad6bd5 [formerly 5276ee1deee73f8ee4d70a66d41e3492943f9805]]]]]
Former-commit-id: 8cd0c200e707cb98fdee8779a84094ce939f72df [formerly 3bc2095bb7e1d27099a60c4e0b323148ce340be9]
Former-commit-id: c8a6c3c3f50708f769fe5c7988faa9b03a5ce80c
Former-commit-id: c71019cd6c699930324587d5cc73f928c5b24b6a
Former-commit-id: 55f9bb279021eca071a50ae628f9c1c511ba8ef2
Former-commit-id: ee7655ab1e83fe11af648fff51739c3b404888d3 [formerly 9829e5e1b19c56a1421ef5be9108c31cd2889043]
Former-commit-id: 224f0331c52d6b3cc9984ae6271794518bb09c61
2018-12-26 21:26:48 +01:00
Romain GÉRARD
fe1c17bac1 Sock5 proxy: Add support for IPV4 connection method
Former-commit-id: 2b786bdfca8f7c4f13be5d3f2fbffabb3bb6c1ff
Former-commit-id: 79521d28ef7ec78f037a39d345d0b7caa6a21aad [formerly 4f529c3bf32ec3d058f0437a4ed56cd530bb0380] [formerly 5fe75721d4197c31274853956429750a8a6bae34 [formerly b985c09e33290e80db92edd3a6688d56df463ab4 [formerly d19a7a5290bd4676d018052c1ba82ff0a2f7c53c] [formerly d19a7a5290bd4676d018052c1ba82ff0a2f7c53c [formerly d19a7a5290bd4676d018052c1ba82ff0a2f7c53c [formerly 2a811ddc94f163f29e7b13c5c0209edaa0ba94dd]]]]]
Former-commit-id: ac4e18a935137eac85d7a1fcb03aff223ce9a413 [formerly c6a4d21c51709b03cab6c6de9934188da49028e7]
Former-commit-id: 736cb733cf4083f0d6e98f4bd4315119b65ac994
Former-commit-id: 3639f8c1a181eed16f4d642745cbe19725834784
Former-commit-id: d0d2d9ea134579057a321900564f210e35e85a42
Former-commit-id: afc68a28fd773821f36742d9c561f1df8c43f66b [formerly 441a3c84970aba955d980519a74178e4dbe64ec1]
Former-commit-id: 08598a77acb35f6e71f6c5b8aabd905348ec9ea8
2018-06-06 00:46:02 +02:00
Romain GÉRARD
9595690aae Send websocket ping every 30 seconds
Former-commit-id: f8cf0e717959c0b3d388db1a5517d30ff384b1c4
Former-commit-id: cd640b4bdb7c1fc931ae0713fad0b51686711a6c [formerly b25bb73f6ae4fa09076cca43cb1538e497ba1a95] [formerly 7be7f4542e51464b174eda61956323b3cd64e2e4 [formerly 4808ab38b2dc6956ab9900ffaf36e6b09cd42777 [formerly 4808ab38b2dc6956ab9900ffaf36e6b09cd42777 [formerly 4808ab38b2dc6956ab9900ffaf36e6b09cd42777 [formerly ce17ed3ef32e2128b9d45b256a5c1445a6e4bd6f]]]]]
Former-commit-id: 9c55ce78df5bcbc718a656a76f12fd797730294c [formerly 34c70e20636616071b5dbe28d56a7d769f6d62a3]
Former-commit-id: 54b81c1c6f555f03d0fc3e19b183bf393c99c1d6
Former-commit-id: 30e421ec0b35682a3b743c84b8e47ec590d73485
Former-commit-id: dfbe1a29b9527f2331cd6d231dc2f82ec326e76d
Former-commit-id: 782dccac058f7ce2863b33a2afe3217b001a9280 [formerly 60605ee4f15384b7dfa2db69df6881c1d2cac51f]
Former-commit-id: aecbcf00e7391129896a001e1a96e10350754dea
2018-05-27 21:47:18 +02:00
Erèbe - Romain Gerard
0ec27e9d27 fix typo in debug log in the HTTP proxy
Former-commit-id: 3a5b68b568058848a84c5801e99be1e3d11f2675
Former-commit-id: b9c43a5b446e9c3fde4e9016864e036b1c97dfba [formerly 7cf2553244e5ff0af1c729564905ab05d072720f] [formerly 0a79f27e64df05797d06a8da9bf7543c84e86ed7 [formerly 5599e859e906704ab0d6b0a65658a4aeb8403f8e [formerly 5599e859e906704ab0d6b0a65658a4aeb8403f8e [formerly 5599e859e906704ab0d6b0a65658a4aeb8403f8e [formerly 843382a22560623c415f2e527be2a1bb1bb87772]]]]]
Former-commit-id: 75969df6de5f2c3ee08f81dc1a4d457d492b87ed [formerly 592aadc955cf333a8e23f7b75707159ed9510d8a]
Former-commit-id: 94cebea834834afcb565978fd8a188af8afa86a6
Former-commit-id: 8549165bda8f705454ee2f2dedc81276918c4b71
Former-commit-id: 0761f82c3eb56fded8c6f5c4ed4b4056625948e9
Former-commit-id: 74c23dae521058b04ea41ac90e9ba06f76ecd6d1 [formerly 3e7d2e15cc64a4ddb87f24d817a64c714a7f6c81]
Former-commit-id: e3a78bcbc38400fd94f9cc0dcf7cd4517000baa4
2017-12-28 10:17:45 +01:00
Erèbe
048be2a604 Fix udp server
Former-commit-id: dc6b384be35d0da3d96502aee7a34f03f64069f9
Former-commit-id: 886ee2d95c42ce476a9233c66d266f76edd7c352 [formerly 5938a7b6b407cdc64f0972b4fe0d5cc44af815a6] [formerly 71fe7cf675464eee1ee6c467e6835ea0ae60f30a [formerly 3ed2dbb76a6fe601478b01b60a4b845703eee2d2 [formerly 3ed2dbb76a6fe601478b01b60a4b845703eee2d2 [formerly 3ed2dbb76a6fe601478b01b60a4b845703eee2d2 [formerly c58f0795fa3796cb7873988ebf64361b0860c4b5]]]]]
Former-commit-id: 7bc8c5f4bfa8854ace4360d9d645795964923fdf [formerly ae69d9d2df4790d121871a578a48ac1e3414498f]
Former-commit-id: ce2df65ede7f77d7e0a59ee65e502f88a5c85c6b
Former-commit-id: a69b9bfb8c42a9a9523535e2c225fec06228c4eb
Former-commit-id: efc5bbd6fbe9cd3f550f5767313559a1df65bb77
Former-commit-id: f32be564261055e3499491aff9bc88ca0e897adf [formerly 794c396edb9719688b3040a2f484afa3591059f9]
Former-commit-id: ab8cbe512c3737a53733083fb8f499e6bf589fb1
2016-11-26 16:59:21 +01:00
Erèbe
cd450ac9e4 Refactor HTTP Proxy code
Former-commit-id: 276c9b224a2a7e8d3eb7c906e0f2346896dd0987
Former-commit-id: 6e243437da37a6301c0959f1a449572a96f96bcf [formerly b56151dc14bea8a86bf672047bbbb9cf8486b4db [formerly b56151dc14bea8a86bf672047bbbb9cf8486b4db [formerly b56151dc14bea8a86bf672047bbbb9cf8486b4db [formerly b5b717b1fa6bb2e1b9b893a5f8495011085a13a9]]]]
Former-commit-id: fd939ef892ec61d3781e8094d6801187fa15febf
Former-commit-id: 908ed7b0f78f80d26b8887885088d6c0dfd9d99a
Former-commit-id: 4cb284f918770412de20382c1b834e174dd4e304
Former-commit-id: 4dc0d2c8313c793387116f118c318087389538e3 [formerly 3daca73d2b9f52ad8c3396c01086f41292a94158]
Former-commit-id: 64736efbae1a6f444b38cbc2c803d755c2fadde8
2016-10-10 15:25:02 +02:00
Erèbe
cde2afd264 Use default-extensions in cabal
Former-commit-id: bc12a795326740f2f7504c77e6efdd4a633d6a8e
Former-commit-id: 206c1715e5164d8485423905848e545eecb2a220 [formerly 5ef346e51622358e3e9d4c6e94e348758fac361f [formerly 5ef346e51622358e3e9d4c6e94e348758fac361f [formerly 5ef346e51622358e3e9d4c6e94e348758fac361f [formerly 3d9f6a38a164185f31d5610b045744b79190087b]]]]
Former-commit-id: 73593f34778fd5c5be7436189d48b72fc8699a0e
Former-commit-id: b82bb6c8a4286f6c8b37331cecdd3de699771e90
Former-commit-id: fa5ef7ed8fb050a4fb24f18a5101faa10b72e4a2
Former-commit-id: 11138952c09bf43fccc5dc2dc8625c83b4d3dbdb [formerly 382271cf86238cf125c05867c60c53fef176955a]
Former-commit-id: e452e246198248849d76ee37f0e20a6ce507a855
2016-10-09 20:54:08 +02:00
Erèbe
7195336f6b Remove test code + upgrade to ls 7.2
Former-commit-id: 71d4fd645deb0139d101b6116c9135c68c1d6a8e
Former-commit-id: 7059648a18c785153d3fc33a456741620d20bf49 [formerly cf731f008be1159e6a853f2afd568e8c0612bde3 [formerly cf731f008be1159e6a853f2afd568e8c0612bde3 [formerly cf731f008be1159e6a853f2afd568e8c0612bde3 [formerly 8db96c28f81ffc0c2cbe722c509e9efa5d992b08]]]]
Former-commit-id: fa08c8d8d2857a41c4e77b5aeb3d05271ebf75f8
Former-commit-id: 05c20ad6ce01cfc5d2676c9b5ecdd9201f07705a
Former-commit-id: 2f6c4808ec23bd6b38581b3f5ff24f024648bdd1
Former-commit-id: c755a7050026caafaa9bb91fede5ed7ab2e42743 [formerly b2d3ad3fd179f2071903cfa20ad62b7b4aacc073]
Former-commit-id: 61c646a41feef120a0532206a1ff098f3d4fa372
2016-10-03 11:36:39 +02:00
Erèbe
cbce46fb44 Bump to lts 7.0
Former-commit-id: b3b57bcba2a7d50ebf38054b67792af1e6e755ce
Former-commit-id: e70e4f3f49958c45dbe66aef59ad046fddac801c [formerly 10a6d99cc79e84205bd64fb9c17932cc346b40f3 [formerly 10a6d99cc79e84205bd64fb9c17932cc346b40f3 [formerly 10a6d99cc79e84205bd64fb9c17932cc346b40f3 [formerly 1571c1e641d0b00cbbb494fe5b3f4da6b05ca02a]]]]
Former-commit-id: e62e91900bb398c287ecc8fab53bcad539dc51ec
Former-commit-id: 3da4f732c156662ecdb10a854a941399ab53048e
Former-commit-id: ebaeec43d0a7c399f0401898471c084d4e47042c
Former-commit-id: b540ee5a98380a08c3672247f99cc7f83732e490 [formerly 34f795463f2de5b859abba86d7bddeb7abd0d34c]
Former-commit-id: d9adc79359d666beb64827e2ef59796ab37de408
2016-09-15 23:10:26 +02:00
Erèbe
81fa4969ce Maj Logger
Former-commit-id: 4f92bde65f99832c5ae24ae6698c211e9f2bde18
Former-commit-id: f12ba4b2900a22043fe76735c912ae3fa205fe21 [formerly 24f48bf30c121d1466cfe329678f3620c1a77696 [formerly 24f48bf30c121d1466cfe329678f3620c1a77696 [formerly 24f48bf30c121d1466cfe329678f3620c1a77696 [formerly 9aeb97ec347b0a65a85f75b6d0ed93e3bd54dd53]]]]
Former-commit-id: 1cb3fa8c9a953dedecb7d66c94cf914312b71a77
Former-commit-id: 092df44e5d7a9a560eadb4f186a77010df215837
Former-commit-id: 2f0d76ad50d96c6477564249b5b7cba9b84d0f33
Former-commit-id: a393fbcadcf6baa7515c5dfb2d7b1a3eb2cec58b [formerly c64d29b4305ce9be62bc46030750f8a627304d95]
Former-commit-id: 2cd463763ae087b60e2008ca9e2aaa26284e8a42
2016-08-27 18:42:38 +02:00
Erèbe
1f923c4943 Refactor to modularize more
Former-commit-id: 1d5ae90a514e575706d5a4ed333cb7bcea613fed
Former-commit-id: 9cfc1936086198e0c437346608794694e0e95b90 [formerly 33e7bbb44e5903ddb90b3fe2c0e5555dbc546bd5 [formerly 33e7bbb44e5903ddb90b3fe2c0e5555dbc546bd5 [formerly 33e7bbb44e5903ddb90b3fe2c0e5555dbc546bd5 [formerly c66b2faff45e0b65779d7fed4d3355d859ae8e34]]]]
Former-commit-id: 4d38d80a6e1bd03be92f0939f269803676094da4
Former-commit-id: ad7ee33491764b8111037c046f64b5c288cfe420
Former-commit-id: 7089db6838c542c2a278992e492a421303b20707
Former-commit-id: 00f00a4f5296725498aeb0daa8b21cfa4568627e [formerly fd688a2c91cc9c927fd8fa32f7e62dc432286d86]
Former-commit-id: 991bfe5b8f959fad26e326877e92f168127f0803
2016-08-27 18:31:32 +02:00
Erèbe
bb1b743932 Improve logging for socks5 proxy 2016-08-25 11:24:56 +02:00
Erèbe
e9b5137afb Socks5 done \O/ 2016-08-24 22:49:33 +02:00
Erèbe
ff6c4164b8 Add socks5 options to commandline 2016-08-24 15:26:25 +02:00
Erèbe
d2bd237bdd Maj sock5 2016-06-23 18:40:38 +02:00
Erèbe
5eb27ee3fb Maj sock5 server 2016-06-22 23:22:23 +02:00
Erèbe
a2eac5a595 Maj sock5 proxy 2016-06-20 17:10:48 +02:00
Erèbe
e6950ea526 maj sock5 2016-06-15 14:01:50 +02:00
Erèbe
ae4198fd56 Use monad Error 2016-06-14 14:11:57 +02:00
Erèbe
0bd70fd006 Maj ghc 8.0 + add sock5 types 2016-06-13 14:04:01 +02:00
Erèbe
dce0372c4b Add http proxy authorization 2016-06-05 22:13:09 +02:00
Erèbe
15016cf330 Add utils files 2016-06-01 22:31:34 +02:00
Erèbe
9f668ca95a Minor refactoring 2016-06-01 22:30:49 +02:00
Erèbe
1921d7d03a Maj logging + Add quiet mode 2016-06-01 22:01:23 +02:00
Erèbe
42ae84a0ae Better error handling 2016-06-01 17:28:55 +02:00
Erèbe
79e0afa224 Better Logging 2016-06-01 16:24:16 +02:00
Erèbe
ca70b8b318 Better logging 2016-05-31 23:44:02 +02:00
Erèbe
750aeedd6b Test 2016-05-31 18:35:04 +02:00
Erèbe
8d33cf9698 Set a timeout to the httpProxy connexion 2016-05-31 13:27:01 +02:00
Erèbe
3cd5dba661 add hslogger 2016-05-30 17:27:04 +02:00
Erèbe
6d0eea8328 Simpler interface 2016-05-30 17:20:47 +02:00
Erèbe
ed22e0db33 Improve signatures 2016-05-29 12:39:56 +02:00
Erèbe
0da678a58d Add proxy handling 2016-05-28 21:17:48 +02:00
Erèbe
ae3d200467 Adding new files 2016-05-28 15:16:12 +02:00
Erèbe
a9c96fef86 Rework 2016-05-28 15:14:55 +02:00
Erèbe
f5cc7b31b8 Auto generate hashable instance for SockAddr 2016-05-22 19:27:13 +02:00
Erèbe
8bf3031a87 remove useless tshow 2016-05-22 12:21:35 +02:00
Erèbe
9e5ac960e2 Add comment 2016-05-22 01:21:54 +02:00
Erèbe
6ec0a45900 Use conduit instead of raw tls package 2016-05-21 18:05:51 +02:00
Erèbe
d993e11730 Add self signed certificate with weak crypto 2016-05-21 17:32:37 +02:00
Erèbe
38b465980f Add tls server 2016-05-21 15:41:56 +02:00
Erèbe
51fdf79ed1 Better handling of exceptions 2016-05-18 23:31:19 +02:00
Erèbe
a315f59673 Change Mvar to IORef + Signature
Better handling of exceptions
2016-05-18 23:31:13 +02:00
Erèbe
0340dc49f1 Maj restricted option 2016-05-16 23:55:06 +02:00
Erèbe
b40e0e677c Add restric to for the server 2016-05-16 23:33:00 +02:00
Erèbe
58a313f354 Improve readability 2016-05-16 22:19:34 +02:00
Erèbe
499f872d1a Style 2016-05-16 21:58:35 +02:00
Erèbe
e598e3e8d2 Cleanup imports 2016-05-16 02:31:20 +02:00
Erèbe
d2ac64d1a6 add parameter for tls 2016-05-16 02:01:56 +02:00
Erèbe
0b001c3264 Add tls support for clientM & fix socket leak 2016-05-16 01:09:56 +02:00
Erèbe
8930a823a2 Cosmetic changes 2016-05-15 02:09:18 +02:00
Erèbe
1ed3177040 First working state (UDP and TCP working) 2016-05-15 01:50:16 +02:00
Erèbe
3060a5d2c7 ground 0 2016-05-11 23:39:02 +02:00