Commit Graph

60 Commits (8aae4c11259c93ea729c234d96fc9236d5c8390c)

Author SHA1 Message Date
Soner Tari a314be6e94 Add conn context and is_child fields to proxy context struct to get rid of extra function params and to simplify conditionals
Remove redundant parent/conn pointer vars
Use conn instead of parent amap
6 years ago
Soner Tari 6f023e5990 Avoid comparison between signed and unsigned integer, reported by @janusloo on Linux DietPi 4.14.22-v7+ #1096 SMP Mon Feb 26 19:14:22 GMT 2018 armv7l GNU/Linux, I don't see such warnings on 64-bit OpenBSD or Linux though, even with -Wsign-compare 7 years ago
Soner Tari 0fee063e0c Use %zu for size_t, and avoid comparison between signed and unsigned integer, reported by @janusloo 7 years ago
Soner Tari f6a63c33b1 Fix time_t portability, see https://www.openbsd.org/papers/eurobsdcon_2013_time_t/mgp00029.html 7 years ago
Soner Tari 9d435e180c Update with SSLsplit 0.5.2 and develop branch changes as of 270218 7 years ago
Soner Tari 4c8831bd90 Update with SSLsplit 0.5.1 changes, fix LibreSSL version issues
Add VerifyPeer and AllowWrongHost options
7 years ago
Soner Tari 3ae89131dc Use different syslog facilities for error, conn, and stats logs, so they can be filtered into separate log files in syslog.conf 7 years ago
Soner Tari b064ffa668 Use llu int as unique conn id, much simpler than uuid 7 years ago
Soner Tari 137f017cb5 Fix EXPIRED message bug, other fixes and improvements 7 years ago
Soner Tari a1c5d05143 Add support for log priority to error logs, so syslogd prints the correct prio for error logs now 7 years ago
Soner Tari 9ec58f821b Changes needed while adding SSL proxy support to WUI
Separate mail/mails to pop3/pop3s/smtp/smpts for statistics
Write connect logs to syslog too, for statistics
Fix log lines for statistics, remove fds from err logs
7 years ago
Soner Tari 7748e3ec1b Add conf file support, with -f command line option, supports a subset of all possible options 7 years ago
Soner Tari 1a6eab50a5 Tidy and clean logs up
Add DEBUG_PROXY directive around all log_dbg_level_printf() and related lines
Log stats to syslog, similar to error logs, so that it is simpler to rotate and parse
-O w/o -g is failing bufferevent_socket_connect for parent dst, so either enable -O w/ -g, or disable -O w/o -g (-O2 is failing too)
Refactoring
7 years ago
Soner Tari 9e637dd2cc Clean-up 7 years ago
Soner Tari 5a136b7ce7 Add extra stats
Rearrange, clean-up
7 years ago
Soner Tari 2411f79582 Add plain or ssl info to SSLproxy specific header line
Fix child eof bug
Flickr keeps redirecting to https with 301 unless we remove the Via line of squid, so apparently flickr assumes the existence of Via header field or squid keyword a sign of plain http, even if we are using https
Also do not send the loopback address to the Internet
Other fixes
7 years ago
Soner Tari 67ddee1585 Import sslsplit-devel changes
Add stats logs, initial
Add SSLproxy_SrcAddr header field
Clean-up
7 years ago
Soner Tari 378c8c03ef Fix/improve logging, clean-up 7 years ago
Soner Tari 1b9a192947 Remove recursion while freeing children, parent frees children in a loop now
Improve, simplify, clean-up
7 years ago
Soner Tari ae35623c15 Remove meta ctx completely
Fix issues
7 years ago
Soner Tari 09e1c858b9 Refactoring to remove mctx 7 years ago
Soner Tari 133584361f Rename and clean-up 7 years ago
Soner Tari 496a4f090d Refactoring: Simplify, reduce, rearrange, rename, and clean-up
Get rid of now unnecessary child info struct and functions
7 years ago
Soner Tari d7094d7138 Refactoring: Simplify, reduce, rearrange, rename, and clean-up
Got rid of now unnecessary pxy_conn_is_ready_to_free*() functions
Got rid of now unnecessary duplicate child and parent free functions: pxy_*_conn_free()
Fix error handling
7 years ago
Soner Tari 1a446cd243 Refactoring: Create child ctx
Rearrange, clean-up
7 years ago
Soner Tari fc60db0e74 Disable the workaround for dst connection issues, NULL r/w cbs
Reduce the conn timeout to 30s again
7 years ago
Soner Tari 85875be00f Sometimes dst write cb fires but not event cb, especially if the listener cb is not finished yet, so the conn stalls. This is a workaround for this error condition, nothing else seems to work.
Clean-up
7 years ago
Soner Tari 590a693998 Rearrange and clean-up 7 years ago
Soner Tari e8332f11cf Make conn termination more similar to orig sslsplit code
Free child info struct of a deleted child
Rename, rearrange, and clean-up
7 years ago
Soner Tari d6e1ed2cef Fix a potential issue which could forward a packet without any SSL proxy address
Rename, rearrange, and clean-up
7 years ago
Soner Tari e3266cc811 Fix closing fd2 when uninit, i.e. fd2=0, which was freeing stdin
Clean-up and improvements
7 years ago
Soner Tari 8ad3b5db25 Defer all e2 setup until after parent is connected
Clean-up and improvements
7 years ago
Soner Tari 4d88906d24 Clean up and improve 7 years ago
Soner Tari 4f6b207e57 Improve conn termination: Close children asap if there is no parent, close parent asap if there is no child 7 years ago
Soner Tari ad1f95e465 Remove conn mutexes: Use thrmgr mutex during attach/detatch only, do eveything in the same thread, do not touch the other threads
Flex, fix, and improve conn termination: Make it more similar to orig sslsplit code
Fix issues, and clean-up
7 years ago
Soner Tari ecfaf24614 Add more child info to conns list, and clean-up 7 years ago
Soner Tari 5047df8cba Fix some of the compiler warnings, rearrange, and clean-up 7 years ago
Soner Tari be54db770f Add comments, improvements, and clean-up 7 years ago
Soner Tari 0b0f6b21dc Add uuid to all conn mctxs, otherwise we cannot uniquely identify them, causing trouble especially while deleting conns
Fix issues, clean-up
7 years ago
Soner Tari 833e1903e1 Dump conn info list
Remove conns using delete list of timed out conns
Fix issues, improvements
7 years ago
Soner Tari 82b58c2dab Fix multithreading
Clean-up
7 years ago
Soner Tari 9858928b73 Add debug levels, initial 7 years ago
Soner Tari d033ea68dd Plain TCP version is running good enough, next will try to switch the SSL on 7 years ago
Daniel Roethlisberger ac3e845fbe Test dnsbase and evbase for !NULL before freeing
Fix segmentation fault upon exiting the main loop that was introduced
when evdns initialization was made optional, resulting in dnsbase
elements not always being initialized.

Introduced in:	0e2b748
9 years ago
Daniel Roethlisberger 88c039b059 Don't test NONNULL arguments for NULL 9 years ago
Daniel Roethlisberger 0506024587 Update copyright notices to 2016 9 years ago
Daniel Roethlisberger 0e2b748bba Only init DNS when DNS is required by proxy specs
Only initialize evdns if DNS lookups are actually required by the loaded
proxy specifications.  This allows sslsplit to work in non-DNS modes in
situations where the local DNS resolver does not work, such as for local
use on a system without network connectivity.  Currently, only SNI based
proxy specs require DNS.  On systems without network connectivity, DNS
subsystem init may fail due to /etc/resolv.conf being (temporarily)
unavailable.

Issue:		#104
9 years ago
Daniel Roethlisberger 91da4674e5 Update copyright, license and tagline
-   Update copyright to 2015
-   Remove the non-standard "unmodified" from the 2-clause BSD license
-   Remove scalable from the tagline to avoid misinterpretations
10 years ago
Daniel Roethlisberger fb2841f645 Zero allocated elements before initializing them
For some error conditions, the error handler depends on
ctx->thr[idx]->dnsbase to be zeroed expicitly after allocation.
To prevent this type of error, zero all allocated memory even
though it will get written to in any case.
10 years ago
Daniel Roethlisberger 508435d929 Use correct pointer type in sizeof() 10 years ago