diff options
| author | mm <mm@FreeBSD.org> | 2011-05-23 06:14:35 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-05-23 06:14:35 +0800 |
| commit | 033e2dd5934de17121656732fbb1146163c1a278 (patch) | |
| tree | f340d59f8d81c2f8fc42d0edf36cc5726ff27482 /net/relayd/files/patch-relayd-log.c | |
| parent | b8788e785649b953cd260b02fc80e32977efa176 (diff) | |
| download | freebsd-ports-graphics-033e2dd5934de17121656732fbb1146163c1a278.tar.gz freebsd-ports-graphics-033e2dd5934de17121656732fbb1146163c1a278.tar.zst freebsd-ports-graphics-033e2dd5934de17121656732fbb1146163c1a278.zip | |
Update to 4.9.20110522
Diffstat (limited to 'net/relayd/files/patch-relayd-log.c')
| -rw-r--r-- | net/relayd/files/patch-relayd-log.c | 72 |
1 files changed, 14 insertions, 58 deletions
diff --git a/net/relayd/files/patch-relayd-log.c b/net/relayd/files/patch-relayd-log.c index 4921f977966..518d394c6df 100644 --- a/net/relayd/files/patch-relayd-log.c +++ b/net/relayd/files/patch-relayd-log.c @@ -1,58 +1,14 @@ ---- relayd/log.c.orig 2011-01-15 00:27:09.012456298 +0100 -+++ relayd/log.c 2011-01-15 00:39:01.553947279 +0100 -@@ -45,6 +45,7 @@ - #include "relayd.h" - - int debug; -+int verbose; - - void vlog(int, const char *, va_list); - void logit(int, const char *, ...); -@@ -55,6 +56,7 @@ - extern char *__progname; - - debug = n_debug; -+ verbose = n_debug; - - if (!debug) - openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); -@@ -63,6 +65,12 @@ - } - - void -+log_verbose(int v) -+{ -+ verbose = v; -+} -+ -+void - logit(int pri, const char *fmt, ...) - { - va_list ap; -@@ -141,7 +149,7 @@ - { - va_list ap; - -- if (debug > 1) { -+ if (verbose > 1) { - va_start(ap, emsg); - vlog(LOG_DEBUG, emsg, ap); - va_end(ap); -@@ -192,9 +200,15 @@ - case HCE_ICMP_WRITE_TIMEOUT: - return ("icmp write timeout"); - break; -- case HCE_TCP_CONNECT_ERROR: -- return ("tcp connect error"); -+ case HCE_TCP_SOCKET_ERROR: -+ return ("tcp socket error"); -+ break; -+ case HCE_TCP_SOCKET_LIMIT: -+ return ("tcp socket limit"); - break; -+ case HCE_TCP_SOCKET_OPTION: -+ return ("tcp socket option"); -+ break; - case HCE_TCP_CONNECT_FAIL: - return ("tcp connect failed"); - break; +--- relayd.orig/log.c 2011-05-22 01:06:39.461146172 +0200 ++++ relayd/log.c 2011-05-22 01:06:54.680052759 +0200 +@@ -16,7 +16,11 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#else + #include <sys/types.h> ++#endif + #include <sys/queue.h> + #include <sys/socket.h> + #include <sys/tree.h> |