Commit graph

34 commits

Author SHA1 Message Date
Romain GERARD
5d62604582 #57 Allow to specify websocket ping frequency
Former-commit-id: 31c30bf3ff09e54b8fb8e7610aabae0b1247502f
Former-commit-id: 3149f827351c421bc99edad7381643bbac567d56 [formerly 084fb35038a11bf8f4016f1eca51295199534d68] [formerly d6284387041bc84ebc3859d2a357cb7e9b678e9e [formerly 8413b4a3244698b20e3356cb5f9d76b24122d93c [formerly 8413b4a3244698b20e3356cb5f9d76b24122d93c [formerly 8413b4a3244698b20e3356cb5f9d76b24122d93c [formerly fddae990cae36aba019f83124e522d2545b93ecf]]]]]
Former-commit-id: 186beb54d83f454ae545c45194e1ba3e9eab1495 [formerly a7d06a8c6e0064c48eee331b9fa6f87496ba0f37]
Former-commit-id: 5f88e7d16eb372828bbfeaba017699f62db92c6c
Former-commit-id: a7fb9dc52d52d177d26ebdd78ab69dadddd17939
Former-commit-id: b1a292297fb943c3f555ff639802fcdf81005240
Former-commit-id: ea8f23d6c60e0b316358255156bbd644330a90e9 [formerly 961596cfff926e301cf39cf0b2114d58a62b7e9a]
Former-commit-id: 1b85c73b4c55a63dc96af4c7af6e1a5edc3d9616
2020-12-07 10:59:13 +01:00
Romain GERARD
e8f3fc0259 \#65 Add host Header and TLS SNI override
Former-commit-id: 5ddf5c5b7a8d1bd483ac063e5c09f058c80b820e
Former-commit-id: d97bd60ef93720e94274be0d1cd50f1d742949dd [formerly df42280ad7675379c9b283f658e5e75c8c28f1a4] [formerly 95700181615ef2eaf461fdb3e0c67af4b8aa54e8 [formerly da23f33f04294a146a691f6d635884942ca00967 [formerly da23f33f04294a146a691f6d635884942ca00967 [formerly da23f33f04294a146a691f6d635884942ca00967 [formerly f40c007627bc5a26208c64cd3e5479a43a7a1c20]]]]]
Former-commit-id: 3b061c8e6950a03ceb4f2e44651609f4d8899248 [formerly ee6563bdd95ec09d33aa6610d201a8f581137626]
Former-commit-id: 3070702567889c7a53477714d65e4476e6056646
Former-commit-id: 1485f4efa64ed475d15780d316306feffb7b53e0
Former-commit-id: df44169b35e25e59ec9a3a818b38d0986ac68e02
Former-commit-id: 49e8fdce68b6b06f23c8b681163ac7e48b6e7075 [formerly 7277e9db3e5301faac5ef4dc7641f61d367353b0]
Former-commit-id: b99e5bdd73ac1ee14db7a6509ea9ae4489873532
2020-12-07 10:33:27 +01:00
Dmytro Meleshko
ce3a225dfc Add upgrade authorization (#55)
Former-commit-id: fc0fd8c3e86b05bf70b375fcd9003bfb3c3cef2f
Former-commit-id: 5e9886504a259694b3f701facb3a157c58c51c08 [formerly 91dcf07282fdb8eb4509ece65e4319afc2e0e63a] [formerly 0e4ab369f6dccd4345abcb231dede9792c6da1b6 [formerly 08dd7bbfe8f0e83f4da3a5cd075829879ed7708e [formerly 08dd7bbfe8f0e83f4da3a5cd075829879ed7708e [formerly 08dd7bbfe8f0e83f4da3a5cd075829879ed7708e [formerly 110b575813ba5bc29f6781c186bc717b902b19e8]]]]]
Former-commit-id: 246c512eb0079381e71025289263128d3276b033 [formerly 646016a7440f79a4cd780592673886d9fb56e666]
Former-commit-id: 3566d8c6182750caecb4d12efa1b99f2907cefd0
Former-commit-id: ab0c88e833bdf4880ceb54e97631437365989730
Former-commit-id: 2a034de4c8ae116dbb9417959983e6efb219a4a3
Former-commit-id: 3b0808aae98269da1ee78f37c1843dcd2b1a7434 [formerly 2ee9122afbd141868e78bb428c41cd05f65ac134]
Former-commit-id: 7272db885b47475f33ca39d9bdbe2191159664ff
2020-10-27 13:53:46 +01:00
Romain GÉRARD
71019e413b Fix stdio support #39
Former-commit-id: 246f55f584386261c60b3fee45e5efad98e790c3
Former-commit-id: bf287dec2a7468f0b253a024cac8b29ee3342bee [formerly 8176e5d0f3ef5144d2d01ba5f4b81d481be22b2f] [formerly e17da24300ea7102d78efa1255e416b8e7b67375 [formerly 1cdc5f6b4861456b79e39623c460c838bd6e7694 [formerly 1cdc5f6b4861456b79e39623c460c838bd6e7694 [formerly 1cdc5f6b4861456b79e39623c460c838bd6e7694 [formerly 4d081fcee59b8792745920c53d40eb1ec7c54ae8]]]]]
Former-commit-id: 90d0d845d9c305199f1e0364dbafcfe6bd81e882 [formerly d155d83a30a656fea2296629fac8d9e30ea99888]
Former-commit-id: 1fbff0cbcafe6e32d72d34f5892fd68641da15c5
Former-commit-id: d3dd64e785bb151d9cd7e76e50b519a74fa19b4b
Former-commit-id: 6532a7f8583cd4461298fa4c8d1277e6ce656160
Former-commit-id: 3039e574018bf5af261f19653509ac399d286f8e [formerly 7d9f3cdd94d34d24efb81ad831432570327bf24c]
Former-commit-id: 3bca307bbaf0cf6e98e4c725076df3c97472b639
2020-02-24 22:52:42 +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 GÉRARD
5b152ad99f Listen to TCP/UDP & mutiple -L command line arguments
Former-commit-id: fe7931a137877131be0cb6b4ac199bf5496595f0
Former-commit-id: 7fb3cd78bea5a3a32e6985e520d0e421761e7d3f [formerly 03bfbe7e9089a9cba6640d181afcc047015409ed] [formerly d416b3b6ac3cb913d7ab3458751b3a30055597aa [formerly b014bab246971877d16bb3e8c17d574963d0895a [formerly b014bab246971877d16bb3e8c17d574963d0895a [formerly b014bab246971877d16bb3e8c17d574963d0895a [formerly a7943c24ae097faff115a31d7ce4edd3288b02e4]]]]]
Former-commit-id: 06859f28a16cd8688fbfcfe11a282b44bad9d80b [formerly 749b4cdf6bb72b8ec19ba5f2a26548b58f45effb]
Former-commit-id: 50ffd10f9893a802f0c94f846ac96116e657240a
Former-commit-id: b73912cf8bf61a6f41f830d7442a1ea1e96fbc91
Former-commit-id: 8d1f6e18acc1c6066ff6bbb7a5e993e0ec989e84
Former-commit-id: db4d1219cc0948d94b6870e94cbbf7d3db0ec942 [formerly fe3a3843d756b4ac5bb275740cf750cbcd94850d]
Former-commit-id: f9424ba8d27baa2e2b03eae29459701b80255c09
2019-10-08 20:52:15 +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
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
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
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
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
1921d7d03a Maj logging + Add quiet mode 2016-06-01 22:01:23 +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
cf9ad075f4 remove debug print 2016-05-28 22:45:46 +02:00
Erèbe
45ef2ca3ad remove Remote To Local as it's not implemented yet 2016-05-28 22:32:52 +02:00
Erèbe
0da678a58d Add proxy handling 2016-05-28 21:17:48 +02:00
Erèbe
a9c96fef86 Rework 2016-05-28 15:14:55 +02:00
Erèbe
38b465980f Add tls server 2016-05-21 15:41:56 +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
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