[Pkg-privacy-commits] [onioncat] 77/241: replace log-constants by syslog-used constants
Intrigeri
intrigeri at moszumanska.debian.org
Wed Aug 26 16:16:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch upstream-master
in repository onioncat.
commit 3cada26d7e2cfdd57c296557bc110220564c18c0
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date: Thu Nov 27 11:52:28 2008 +0000
replace log-constants by syslog-used constants
git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@366 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
src/ocat.c | 50 +++++++++++++-------------
src/ocat.h | 13 -------
src/ocateth.c | 8 ++---
src/ocatipv4route.c | 6 ++--
src/ocatlibe.c | 2 +-
src/ocatlog.c | 12 +++----
src/ocatpeer.c | 6 ++--
src/ocatroute.c | 100 ++++++++++++++++++++++++++--------------------------
src/ocatsetup.c | 4 ++-
src/ocatsocks.c | 18 +++++-----
src/ocatthread.c | 4 +--
src/ocattun.c | 24 ++++++-------
12 files changed, 118 insertions(+), 129 deletions(-)
diff --git a/src/ocat.c b/src/ocat.c
index 83fc762..bcde0cc 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -84,12 +84,12 @@ void open_logfile(void)
{
log_debug("logfile %s opened", CNF(logfn));
if (setvbuf(CNF(logf), NULL, _IOLBF, 0))
- log_msg(L_ERROR, "could not setup line buffering: %s", strerror(errno));
+ log_msg(LOG_ERR, "could not setup line buffering: %s", strerror(errno));
fflush(CNF(logf));
return;
}
CNF(logf) = stderr;
- log_msg(L_ERROR, "could not open logfile %s: %s. Defaulting to stderr", CNF(logfn), strerror(errno));
+ log_msg(LOG_ERR, "could not open logfile %s: %s. Defaulting to stderr", CNF(logfn), strerror(errno));
}
}
@@ -100,7 +100,7 @@ int mk_pid_file(void)
if (!(f = fopen(CNF(pid_file), "w")))
{
- log_msg(L_ERROR, "could not create pid_file %s: %s", CNF(pid_file), strerror(errno));
+ log_msg(LOG_ERR, "could not create pid_file %s: %s", CNF(pid_file), strerror(errno));
return -1;
}
@@ -114,12 +114,12 @@ int mk_pid_file(void)
void background(void)
{
- log_msg(L_NOTICE, "backgrounding");
+ log_msg(LOG_INFO, "backgrounding");
switch(fork())
{
case -1:
- log_msg(L_ERROR, "fork failed: %s. Staying in foreground", strerror(errno));
+ log_msg(LOG_ERR, "fork failed: %s. Staying in foreground", strerror(errno));
return;
case 0:
@@ -234,11 +234,11 @@ int main(int argc, char *argv[])
if (urlconv == 2)
{
if ((c = inet_pton(AF_INET6, argv[optind], &CNF(ocat_addr))) < 0)
- log_msg(L_ERROR, "inet_pton failed: %s", strerror(errno)), exit(1);
+ log_msg(LOG_ERR, "inet_pton failed: %s", strerror(errno)), exit(1);
else if (!c)
- log_msg(L_ERROR, "%s is not a valid IPv6 address", argv[optind]), exit(1);
+ log_msg(LOG_ERR, "%s is not a valid IPv6 address", argv[optind]), exit(1);
if (!has_tor_prefix(&CNF(ocat_addr)))
- log_msg(L_ERROR, "address does not have TOR prefix"), exit(1);
+ log_msg(LOG_ERR, "address does not have TOR prefix"), exit(1);
ipv6tonion(&CNF(ocat_addr), CNF(onion_url));
printf("%s.onion\n", CNF(onion_url));
exit(0);
@@ -249,9 +249,9 @@ int main(int argc, char *argv[])
if ((s = strchr(CNF(onion_url), '.')))
*s = '\0';
if (strlen(CNF(onion_url)) != 16)
- log_msg(L_ERROR, "parameter seems not to be valid onion hostname"), exit(1);
+ log_msg(LOG_ERR, "parameter seems not to be valid onion hostname"), exit(1);
if (oniontipv6(CNF(onion_url), &CNF(ocat_addr)) == -1)
- log_msg(L_ERROR, "parameter seems not to be valid onion hostname"), exit(1);
+ log_msg(LOG_ERR, "parameter seems not to be valid onion hostname"), exit(1);
if (CNF(ipv4_enable))
oniontipv4(CNF(onion_url), &CNF(ocat_addr4), ntohl(CNF(ocat_addr4_mask)));
@@ -265,14 +265,14 @@ int main(int argc, char *argv[])
exit(0);
}
- log_msg(L_NOTICE, "%s (c) Bernhard R. Fischer -- compiled %s %s", PACKAGE_STRING, __DATE__, __TIME__);
+ log_msg(LOG_INFO, "%s (c) Bernhard R. Fischer -- compiled %s %s", PACKAGE_STRING, __DATE__, __TIME__);
#if 0
if (CNF(config_file))
{
- log_msg(L_NOTICE, "reading config file %s", CNF(config_file));
+ log_msg(LOG_INFO, "reading config file %s", CNF(config_file));
if ((c = open(CNF(config_file), O_RDONLY)) == -1)
- log_msg(L_ERROR, "error opening file: %s", strerror(errno)), exit(1);
+ log_msg(LOG_ERR, "error opening file: %s", strerror(errno)), exit(1);
ctrl_handler((void*) c);
}
#endif
@@ -280,10 +280,10 @@ int main(int argc, char *argv[])
memcpy(&CNF(ocat_hwaddr[3]), &CNF(ocat_addr.s6_addr[13]), 3);
if (CNF(use_tap));
{
- log_msg(L_NOTICE, "MAC address %02x:%02x:%02x:%02x:%02x:%02x",
+ log_msg(LOG_INFO, "MAC address %02x:%02x:%02x:%02x:%02x:%02x",
CNF(ocat_hwaddr[0]), CNF(ocat_hwaddr[1]), CNF(ocat_hwaddr[2]), CNF(ocat_hwaddr[3]), CNF(ocat_hwaddr[4]), CNF(ocat_hwaddr[5]));
/*if (pipe(CNF(icmpv6fd)) == -1)
- log_msg(L_FATAL, "cannot create multicast pipe: %s", strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "cannot create multicast pipe: %s", strerror(errno)), exit(1);
run_ocat_thread("icmpv6", icmpv6_handler, NULL);*/
}
@@ -292,10 +292,10 @@ int main(int argc, char *argv[])
CNF(tunfd[0]) = CNF(tunfd[1]) = tun_alloc(tunname, CNF(ocat_addr));
#endif
- log_msg(L_NOTICE, "IPv6 address %s", ip6addr);
- log_msg(L_NOTICE, "TUN/TAP device %s", tunname);
+ log_msg(LOG_INFO, "IPv6 address %s", ip6addr);
+ log_msg(LOG_INFO, "TUN/TAP device %s", tunname);
if (CNF(ipv4_enable))
- log_msg(L_NOTICE, "IP address %s", inet_ntoa(CNF(ocat_addr4)));
+ log_msg(LOG_INFO, "IP address %s", inet_ntoa(CNF(ocat_addr4)));
log_debug("tun frameheader v6 = 0x%08x, v4 = 0x%08x", ntohl(CNF(fhd_key[IPV6_KEY])), ntohl(CNF(fhd_key[IPV4_KEY])));
@@ -313,18 +313,18 @@ int main(int argc, char *argv[])
// getting passwd info for user
errno = 0;
if (!(pwd = getpwnam(CNF(usrname))))
- log_msg(L_FATAL, "can't get information for user \"%s\": \"%s\"", CNF(usrname), errno ? strerror(errno) : "user not found"), exit(1);
+ log_msg(LOG_EMERG, "can't get information for user \"%s\": \"%s\"", CNF(usrname), errno ? strerror(errno) : "user not found"), exit(1);
// create pid_file
mk_pid_file();
if (!runasroot && !getuid())
{
- log_msg(L_NOTICE, "running as root, changing uid/gid to %s (uid %d/gid %d)", CNF(usrname), pwd->pw_uid, pwd->pw_gid);
+ log_msg(LOG_INFO, "running as root, changing uid/gid to %s (uid %d/gid %d)", CNF(usrname), pwd->pw_uid, pwd->pw_gid);
if (setgid(pwd->pw_gid))
- log_msg(L_ERROR, "could not change gid: \"%s\"", strerror(errno)), exit(1);
+ log_msg(LOG_ERR, "could not change gid: \"%s\"", strerror(errno)), exit(1);
if (setuid(pwd->pw_uid))
- log_msg(L_ERROR, "could not change uid: \"%d\"", strerror(errno)), exit(1);
+ log_msg(LOG_ERR, "could not change uid: \"%d\"", strerror(errno)), exit(1);
}
log_debug("uid/gid = %d/%d", getuid(), getgid());
@@ -352,14 +352,14 @@ int main(int argc, char *argv[])
// reading config file
if (CNF(config_file))
{
- log_msg(L_NOTICE, "reading config file %s", CNF(config_file));
+ log_msg(LOG_INFO, "reading config file %s", CNF(config_file));
if ((c = open(CNF(config_file), O_RDONLY)) == -1)
- log_msg(L_ERROR, "error opening file: %s", strerror(errno)), exit(1);
+ log_msg(LOG_ERR, "error opening file: %s", strerror(errno)), exit(1);
ctrl_handler((void*) c);
}
// start forwarding packets from tunnel
- log_msg(L_NOTICE, "starting packet forwarder");
+ log_msg(LOG_INFO, "starting packet forwarder");
packet_forwarder();
return 0;
diff --git a/src/ocat.h b/src/ocat.h
index f1facd1..ff2d98d 100644
--- a/src/ocat.h
+++ b/src/ocat.h
@@ -90,18 +90,6 @@
//! keepalive time
#define KEEPALIVE_TIME (MAX_IDLE_TIME/2)
-/*
-//! log flags. word is considered as 16 bit, lower byte for level, upper byte for additional flags.
-#define L_LEVEL_MASK 0x00ff
-#define L_FLAG_MASK 0xff00
-#define L_INFO 0
-#define L_NOTICE 1
-#define L_ERROR 2
-#define L_FATAL 3
-#define L_DEBUG 4
-#define L_FCONN (1 << 15)
-*/
-
#define LOG_FCONN 0x80
#define E_SOCKS_SOCK -1
@@ -140,7 +128,6 @@
#define IPV6_KEY 1
-
struct OcatSetup
{
//! frame header of local OS in network byte order
diff --git a/src/ocateth.c b/src/ocateth.c
index ef0891f..78b55cc 100644
--- a/src/ocateth.c
+++ b/src/ocateth.c
@@ -225,7 +225,7 @@ uint16_t *malloc_ckbuf(const struct in6_addr *src, const struct in6_addr *dst, u
if (!(psh = calloc(1, sizeof(struct ip6_psh) + plen)))
{
- log_msg(L_FATAL, "error creating checksum buffer: %s", strerror(errno));
+ log_msg(LOG_EMERG, "error creating checksum buffer: %s", strerror(errno));
//return NULL;
exit(1);
}
@@ -333,7 +333,7 @@ int ndp_solicit(char *buf, int rlen)
free_ckbuf(ckb);
if (cksum)
{
- log_msg(L_ERROR, "icmpv6 checksum wrong");
+ log_msg(LOG_ERR, "icmpv6 checksum wrong");
return -1;
}
@@ -343,7 +343,7 @@ int ndp_solicit(char *buf, int rlen)
if (mac_get_ip(eh->ether_shost, &in6) == -1)
if (mac_add_entry(eh->ether_shost, &ip6->ip6_src) == -1)
{
- log_msg(L_ERROR, "MAC table full");
+ log_msg(LOG_ERR, "MAC table full");
return -1;
}
memcpy(eh->ether_dhost, eh->ether_shost, ETH_ALEN);
@@ -367,7 +367,7 @@ int ndp_solicit(char *buf, int rlen)
log_debug("writing %d bytes to tunfd %d", rlen, CNF(tunfd[1]));
if (write(CNF(tunfd[1]), buf, rlen) < rlen)
- log_msg(L_ERROR, "short write");
+ log_msg(LOG_ERR, "short write");
return 0;
}
diff --git a/src/ocatipv4route.c b/src/ocatipv4route.c
index 54a46c4..d2c6e5d 100644
--- a/src/ocatipv4route.c
+++ b/src/ocatipv4route.c
@@ -52,7 +52,7 @@ int ipv4_add_route(IPv4Route_t *route, IPv4Route_t **root, uint32_t cur_nm)
{
if (!(*root = calloc(1, sizeof(IPv4Route_t))))
{
- log_msg(L_FATAL, "ipv4_add_route: %s", strerror(errno));
+ log_msg(LOG_EMERG, "ipv4_add_route: %s", strerror(errno));
return E_RT_NOMEM;
}
(*root)->dest = route->dest & cur_nm;
@@ -72,14 +72,14 @@ int ipv4_add_route(IPv4Route_t *route, IPv4Route_t **root, uint32_t cur_nm)
if (IN6_ARE_ADDR_EQUAL(&(*root)->gw, &route->gw))
return 0;
- log_msg(L_ERROR, "route already exists");
+ log_msg(LOG_ERR, "route already exists");
return E_RT_DUP;
}
// break recursion in case of error
if (cur_nm == 0xffffffff)
{
- log_msg(L_ERROR, "netmask error in netmask of route: %08x", route->netmask);
+ log_msg(LOG_ERR, "netmask error in netmask of route: %08x", route->netmask);
return E_RT_ILLNM;
}
diff --git a/src/ocatlibe.c b/src/ocatlibe.c
index 4fb3979..c894a41 100644
--- a/src/ocatlibe.c
+++ b/src/ocatlibe.c
@@ -41,7 +41,7 @@ void oe_close(int fd)
while (close(fd) == -1)
{
r = errno;
- log_msg(L_ERROR, "failed to close %d: \"%s\"", fd, strerror(r));
+ log_msg(LOG_ERR, "failed to close %d: \"%s\"", fd, strerror(r));
if (r == EINTR)
{
log_debug("re-closing %d", fd);
diff --git a/src/ocatlog.c b/src/ocatlog.c
index d89934e..4008322 100644
--- a/src/ocatlog.c
+++ b/src/ocatlog.c
@@ -33,7 +33,7 @@
#define CBUFLEN 1024
static pthread_mutex_t log_mutex_ = PTHREAD_MUTEX_INITIALIZER;
-static const char *flty_[] = {"info", "notice", "error", "fatal", "debug"};
+static const char *flty_[8] = {"emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"};
//! FILE pointer to connect log
static FILE *clog_ = NULL;
@@ -52,7 +52,7 @@ int open_connect_log(const char *dir)
log_debug("creating ocat log dir \"%s\"", buf);
if (mkdir(buf, S_IRWXU | S_IRGRP | S_IXGRP) && (errno != EEXIST))
{
- log_msg(L_ERROR, "could not create ocat directory \"%s\": \"%s\"", buf, strerror(errno));
+ log_msg(LOG_ERR, "could not create ocat directory \"%s\": \"%s\"", buf, strerror(errno));
return -1;
}
@@ -62,10 +62,10 @@ int open_connect_log(const char *dir)
log_debug("opening connect log \"%s\"", buf);
if (!(clog_ = fopen(buf, "a")))
{
- log_msg(L_ERROR, "could not open connect log \"%s\": \"%s\"", buf, strerror(errno));
+ log_msg(LOG_ERR, "could not open connect log \"%s\": \"%s\"", buf, strerror(errno));
return -1;
}
- log_msg(L_INFO | L_FCONN, "connect log started");
+ log_msg(LOG_NOTICE | LOG_FCONN, "connect log started");
return 0;
}
@@ -76,7 +76,7 @@ void vlog_msgf(FILE *out, int lf, const char *fmt, va_list ap)
time_t t;
char timestr[TIMESTRLEN] = "";
const OcatThread_t *th = get_thread();
- int level = lf & L_LEVEL_MASK;
+ int level = LOG_PRI(lf);
if (CNF(debug_level) < level)
return;
@@ -100,7 +100,7 @@ void log_msg(int lf, const char *fmt, ...)
va_start(ap, fmt);
vlog_msgf(CNF(logf), lf, fmt, ap);
va_end(ap);
- if (clog_ && (lf & L_FCONN))
+ if (clog_ && (lf & LOG_FCONN))
{
va_start(ap, fmt);
vlog_msgf(clog_, lf, fmt, ap);
diff --git a/src/ocatpeer.c b/src/ocatpeer.c
index 5a0b5bc..97d9f31 100644
--- a/src/ocatpeer.c
+++ b/src/ocatpeer.c
@@ -95,7 +95,7 @@ OcatPeer_t *get_empty_peer(void)
if (!(peer = calloc(1, sizeof(OcatPeer_t))))
{
- log_msg(L_ERROR, "cannot get memory for new peer: \"%s\"", strerror(errno));
+ log_msg(LOG_ERR, "cannot get memory for new peer: \"%s\"", strerror(errno));
return NULL;
}
@@ -103,7 +103,7 @@ OcatPeer_t *get_empty_peer(void)
peer->fragbuf = &peer->_fragbuf[CNF(fhd_key_len)];
if ((rc = pthread_mutex_init(&peer->mutex, NULL)))
{
- log_msg(L_FATAL, "cannot init new peer mutex: \"%s\"", strerror(rc));
+ log_msg(LOG_EMERG, "cannot init new peer mutex: \"%s\"", strerror(rc));
free(peer);
return NULL;
}
@@ -133,7 +133,7 @@ void delete_peer(OcatPeer_t *peer)
// effectively delete it
if ((rc = pthread_mutex_destroy(&peer->mutex)))
- log_msg(L_FATAL, "cannot destroy mutex: \"%s\"", strerror(rc));
+ log_msg(LOG_EMERG, "cannot destroy mutex: \"%s\"", strerror(rc));
free(peer);
return;
}
diff --git a/src/ocatroute.c b/src/ocatroute.c
index 6c900dd..f420d18 100644
--- a/src/ocatroute.c
+++ b/src/ocatroute.c
@@ -98,14 +98,14 @@ int forward_packet(const struct in6_addr *addr, const char *buf, int buflen)
if ((len = send(peer->tcpfd, buf, buflen, MSG_DONTWAIT)) == -1)
{
- log_msg(L_ERROR, "could not write %d bytes to peer %d: \"%s\", dropping", buflen, peer->tcpfd, strerror(errno));
+ log_msg(LOG_ERR, "could not write %d bytes to peer %d: \"%s\", dropping", buflen, peer->tcpfd, strerror(errno));
}
else
{
if (len != buflen)
{
// FIXME: there should be sender frag handling!
- log_msg(L_ERROR, "could not write %d bytes to peer %d, %d bytes written", buflen, peer->tcpfd, len);
+ log_msg(LOG_ERR, "could not write %d bytes to peer %d, %d bytes written", buflen, peer->tcpfd, len);
}
peer->time = time(NULL);
peer->out += len;
@@ -124,7 +124,7 @@ void queue_packet(const struct in6_addr *addr, const char *buf, int buflen)
log_debug("copying packet to heap for queue");
if (!(queue = malloc(sizeof(PacketQueue_t) + buflen)))
{
- log_msg(L_ERROR, "%s for packet to queue", strerror(errno));
+ log_msg(LOG_ERR, "%s for packet to queue", strerror(errno));
return;
}
@@ -160,7 +160,7 @@ void *packet_dequeuer(void *p)
// replaced clock_gettime() due to portability issues
if (gettimeofday(&tv, NULL) == -1)
{
- log_msg(L_ERROR, "couldn't gettime: \"%s\"", strerror(errno));
+ log_msg(LOG_ERR, "couldn't gettime: \"%s\"", strerror(errno));
memset(&tv, 0, sizeof(tv));
}
else
@@ -179,7 +179,7 @@ void *packet_dequeuer(void *p)
}
if (rc)
- log_msg(L_FATAL, "woke up: \"%s\"", strerror(rc));
+ log_msg(LOG_EMERG, "woke up: \"%s\"", strerror(rc));
log_debug("starting dequeuing");
for (queue = &queue_; *queue; /*queue = &(*queue)->next*/)
@@ -214,12 +214,12 @@ int check_tor_prefix(const struct ip6_hdr *ihd)
if (!has_tor_prefix(&ihd->ip6_dst))
{
- log_msg(L_ERROR, "destination %s unreachable", inet_ntop(AF_INET6, &ihd->ip6_dst, buf, INET6_ADDRSTRLEN));
+ log_msg(LOG_ERR, "destination %s unreachable", inet_ntop(AF_INET6, &ihd->ip6_dst, buf, INET6_ADDRSTRLEN));
return 0;
}
if (!has_tor_prefix(&ihd->ip6_src))
{
- log_msg(L_ERROR, "source address invalid. Remote ocat could not reply");
+ log_msg(LOG_ERR, "source address invalid. Remote ocat could not reply");
return 0;
}
return ntohs(ihd->ip6_plen);
@@ -228,7 +228,7 @@ int check_tor_prefix(const struct ip6_hdr *ihd)
void cleanup_socket(int fd, OcatPeer_t *peer)
{
- log_msg(L_NOTICE | L_FCONN, "fd %d reached EOF, closing.", fd);
+ log_msg(LOG_INFO | LOG_FCONN, "fd %d reached EOF, closing.", fd);
oe_close(fd);
lock_peers();
delete_peer(peer);
@@ -257,9 +257,9 @@ int handle_http(const OcatPeer_t *peer)
"<html><body><h1>HTTP not possible!<br>OnionCat is running on this port at \"%s.onion\"</h1></body></html>\r\n",
OCAT_URL, timestr, CNF(onion_url)
);
- log_msg(L_INFO, "request seems to be HTTP");
+ log_msg(LOG_NOTICE, "request seems to be HTTP");
if (send(peer->tcpfd, response, strlen(response), MSG_DONTWAIT) == -1)
- log_msg(L_ERROR, "could not send html response");
+ log_msg(LOG_ERR, "could not send html response");
return 1;
}
@@ -278,7 +278,7 @@ void *socket_receiver(void *p)
struct ether_header *eh = (struct ether_header*) (buf + 4);
if (pipe(lpfd_) < 0)
- log_msg(L_FATAL, "could not create pipe for socket_receiver: \"%s\"", strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "could not create pipe for socket_receiver: \"%s\"", strerror(errno)), exit(1);
for (;;)
{
@@ -299,7 +299,7 @@ void *socket_receiver(void *p)
}
if (peer->tcpfd >= FD_SETSIZE)
- log_msg(L_FATAL, "%d >= FD_SETIZE(%d)", peer->tcpfd, FD_SETSIZE), exit(1);
+ log_msg(LOG_EMERG, "%d >= FD_SETIZE(%d)", peer->tcpfd, FD_SETSIZE), exit(1);
FD_SET(peer->tcpfd, &rset);
if (peer->tcpfd > maxfd)
@@ -311,7 +311,7 @@ void *socket_receiver(void *p)
log_debug("selecting...");
if ((maxfd = select(maxfd + 1, &rset, NULL, NULL, NULL)) == -1)
{
- log_msg(L_FATAL, "select encountered error: \"%s\", restarting", strerror(errno));
+ log_msg(LOG_EMERG, "select encountered error: \"%s\", restarting", strerror(errno));
continue;
}
@@ -332,7 +332,7 @@ void *socket_receiver(void *p)
peer = get_first_peer();
else if (!(peer = peer->next))
{
- log_msg(L_FATAL, "fd %d ready but no peer found");
+ log_msg(LOG_EMERG, "fd %d ready but no peer found");
unlock_peers();
break;
}
@@ -366,7 +366,7 @@ void *socket_receiver(void *p)
// if len == 0 EOF reached => close session
if (!len)
{
- log_msg(L_NOTICE | L_FCONN, "fd %d reached EOF, closing.", peer->tcpfd);
+ log_msg(LOG_INFO | LOG_FCONN, "fd %d reached EOF, closing.", peer->tcpfd);
oe_close(peer->tcpfd);
unlock_peer(peer);
lock_peers();
@@ -408,7 +408,7 @@ void *socket_receiver(void *p)
#ifdef HANDLE_HTTP
if (handle_http(peer))
{
- log_msg(L_NOTICE | L_FCONN, "closing %d due to HTTP", peer->tcpfd);
+ log_msg(LOG_INFO | LOG_FCONN, "closing %d due to HTTP", peer->tcpfd);
oe_close(peer->tcpfd);
unlock_peer(peer);
lock_peers();
@@ -456,7 +456,7 @@ void *socket_receiver(void *p)
}
if (!drop)
- log_msg(L_NOTICE | L_FCONN, "incoming connection on %d from %s is now identified", peer->tcpfd,
+ log_msg(LOG_INFO | LOG_FCONN, "incoming connection on %d from %s is now identified", peer->tcpfd,
inet_ntop(AF_INET6, &peer->addr, addr, INET6_ADDRSTRLEN));
}
@@ -467,7 +467,7 @@ void *socket_receiver(void *p)
{
log_debug("writing to tun %d framesize %d + 4", CNF(tunfd[1]), len);
if (write(CNF(tunfd[1]), peer->tunhdr, len + 4) != (len + 4))
- log_msg(L_ERROR, "could not write %d bytes to tunnel %d", len + 4, CNF(tunfd[1]));
+ log_msg(LOG_ERR, "could not write %d bytes to tunnel %d", len + 4, CNF(tunfd[1]));
}
// create ethernet header and handle MAC on TAP device
else if (*peer->tunhdr == CNF(fhd_key[IPV6_KEY]))
@@ -491,7 +491,7 @@ void *socket_receiver(void *p)
eh->ether_type = htons(ETHERTYPE_IP);
if (write(CNF(tunfd[1]), buf, len + 4 + sizeof(struct ether_header)) != (len + 4 + sizeof(struct ether_header)))
- log_msg(L_ERROR, "could not write %d bytes to tunnel %d", len + 4 + sizeof(struct ether_header), CNF(tunfd[1]));
+ log_msg(LOG_ERR, "could not write %d bytes to tunnel %d", len + 4 + sizeof(struct ether_header), CNF(tunfd[1]));
}
}
else
@@ -501,7 +501,7 @@ void *socket_receiver(void *p)
}
else
{
- log_msg(L_ERROR, "dropping packet with %d bytes", len);
+ log_msg(LOG_ERR, "dropping packet with %d bytes", len);
drop = 0;
}
@@ -529,13 +529,13 @@ void set_nonblock(int fd)
if ((flags = fcntl(fd, F_GETFL, 0)) == -1)
{
- log_msg(L_ERROR, "could not get socket flags for %d: \"%s\"", fd, strerror(errno));
+ log_msg(LOG_ERR, "could not get socket flags for %d: \"%s\"", fd, strerror(errno));
flags = 0;
}
log_debug("O_NONBLOCK currently is %x", flags & O_NONBLOCK);
if ((fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1)
- log_msg(L_ERROR, "could not set O_NONBLOCK for %d: \"%s\"", fd, strerror(errno));
+ log_msg(LOG_ERR, "could not set O_NONBLOCK for %d: \"%s\"", fd, strerror(errno));
}
@@ -543,7 +543,7 @@ int insert_peer(int fd, const SocksQueue_t *sq, /*const struct in6_addr *addr,*/
{
OcatPeer_t *peer;
- log_msg(L_NOTICE | L_FCONN, "inserting peer fd %d to active peer list", fd);
+ log_msg(LOG_INFO | LOG_FCONN, "inserting peer fd %d to active peer list", fd);
set_nonblock(fd);
@@ -551,7 +551,7 @@ int insert_peer(int fd, const SocksQueue_t *sq, /*const struct in6_addr *addr,*/
if (!(peer = get_empty_peer()))
{
unlock_peers();
- log_msg(L_ERROR, "could not get new empty peer");
+ log_msg(LOG_ERR, "could not get new empty peer");
return 0;
}
lock_peer(peer);
@@ -574,7 +574,7 @@ int insert_peer(int fd, const SocksQueue_t *sq, /*const struct in6_addr *addr,*/
// wake up socket_receiver
log_debug("waking up socket_receiver");
if (write(lpfd_[1], &fd, 1) != 1)
- log_msg(L_FATAL, "couldn't write to socket_receiver pipe: \"%s\"", strerror(errno));
+ log_msg(LOG_EMERG, "couldn't write to socket_receiver pipe: \"%s\"", strerror(errno));
return 1;
}
@@ -600,26 +600,26 @@ int create_listener(struct sockaddr *addr, int sock_len)
family = PF_INET6;
break;
default:
- log_msg(L_FATAL, "unknown address family %d", addr->sa_family);
+ log_msg(LOG_EMERG, "unknown address family %d", addr->sa_family);
return -1;
}
if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
{
- log_msg(L_FATAL, "could not create listener socker: \"%s\"", strerror(errno));
+ log_msg(LOG_EMERG, "could not create listener socker: \"%s\"", strerror(errno));
return -1;
}
if (bind(fd, addr, sock_len) < 0)
{
- log_msg(L_FATAL, "could not bind listener %d: \"%s\"", fd, strerror(errno));
+ log_msg(LOG_EMERG, "could not bind listener %d: \"%s\"", fd, strerror(errno));
oe_close(fd);
return -1;
}
if (listen(fd, 32) < 0)
{
- log_msg(L_FATAL, "could not bring listener %d to listening state: \"%s\"", fd, strerror(errno));
+ log_msg(LOG_EMERG, "could not bring listener %d to listening state: \"%s\"", fd, strerror(errno));
oe_close(fd);
return -1;
}
@@ -662,11 +662,11 @@ int run_local_listeners(short port, int *sockfd, int (action_accept)(int))
log_debug("creating IPv4 listener");
if ((sockfd[0] = create_listener((struct sockaddr*) &in, sizeof(in))) == -1)
- log_msg(L_FATAL, "exiting"), exit(1);
+ log_msg(LOG_EMERG, "exiting"), exit(1);
log_debug("creating IPv6 listener");
if ((sockfd[1] = create_listener((struct sockaddr*) &in6, sizeof(in6))) == -1)
- log_msg(L_FATAL, "exiting"), exit(1);
+ log_msg(LOG_EMERG, "exiting"), exit(1);
for (;;)
{
@@ -694,7 +694,7 @@ int run_local_listeners(short port, int *sockfd, int (action_accept)(int))
log_debug("accepting connection on %d", sockfd[i]);
if ((fd = accept(sockfd[i], (struct sockaddr*) &in6, &alen)) < 0)
{
- log_msg(L_ERROR, "error accepting connection on %d: \"%s\"", sockfd[i], strerror(errno));
+ log_msg(LOG_ERR, "error accepting connection on %d: \"%s\"", sockfd[i], strerror(errno));
// FIXME: there should be additional error handling!
continue;
}
@@ -703,7 +703,7 @@ int run_local_listeners(short port, int *sockfd, int (action_accept)(int))
in6.sin6_family == AF_INET6 ? &in6.sin6_addr :
(void*) &((struct sockaddr_in*) &in6)->sin_addr,
iabuf, INET6_ADDRSTRLEN);
- log_msg(L_NOTICE | L_FCONN, "connection %d accepted on listener %d from %s port %d", fd, sockfd[i], iabuf, ntohs(in6.sin6_port));
+ log_msg(LOG_INFO | LOG_FCONN, "connection %d accepted on listener %d from %s port %d", fd, sockfd[i], iabuf, ntohs(in6.sin6_port));
(void) action_accept(fd);
}
}
@@ -758,7 +758,7 @@ void packet_forwarder(void)
// just to be on the safe side but this should never happen
if ((!CNF(use_tap) && (rlen < 4)) || (CNF(use_tap) && (rlen < 4 + sizeof(struct ether_header))))
{
- log_msg(L_ERROR, "frame effektively too short (rlen = %d)", rlen);
+ log_msg(LOG_ERR, "frame effektively too short (rlen = %d)", rlen);
continue;
}
@@ -788,7 +788,7 @@ void packet_forwarder(void)
if (!check_tor_prefix((struct ip6_hdr*) &buf[4]))
{
- log_msg(L_ERROR, "dropping frame");
+ log_msg(LOG_ERR, "dropping frame");
continue;
}
@@ -809,13 +809,13 @@ void packet_forwarder(void)
#endif
if (!(dest = ipv4_lookup_route(ntohl(in.s_addr))))
{
- log_msg(L_ERROR, "no route to destination %s, dropping frame.", inet_ntoa(in));
+ log_msg(LOG_ERR, "no route to destination %s, dropping frame.", inet_ntoa(in));
continue;
}
}
else
{
- log_msg(L_ERROR, "protocol 0x%08x not supported. dropping frame.", ntohl(*((uint32_t*) buf)));
+ log_msg(LOG_ERR, "protocol 0x%08x not supported. dropping frame.", ntohl(*((uint32_t*) buf)));
continue;
}
@@ -849,12 +849,12 @@ int send_keepalive(const OcatPeer_t *peer)
if ((len = send(peer->tcpfd, &hdr, sizeof(hdr), MSG_DONTWAIT)) == -1)
{
- log_msg(L_ERROR, "could not send keepalive: %s", strerror(errno));
+ log_msg(LOG_ERR, "could not send keepalive: %s", strerror(errno));
return -1;
}
if (len != sizeof(hdr))
{
- log_msg(L_ERROR, "sending of %d bytes keepalive truncated to %d", sizeof(hdr), len);
+ log_msg(LOG_ERR, "sending of %d bytes keepalive truncated to %d", sizeof(hdr), len);
return -1;
}
return 0;
@@ -878,7 +878,7 @@ void *socket_cleaner(void *ptr)
if (act_time - stat_wup >= STAT_WAKEUP)
{
stat_wup = act_time;
- log_msg(L_NOTICE, "stats: ... (not implemented yet)");
+ log_msg(LOG_INFO, "stats: ... (not implemented yet)");
}
// cleanup MAC table
@@ -906,7 +906,7 @@ void *socket_cleaner(void *ptr)
{
peer = *p;
*p = peer->next;
- log_msg(L_NOTICE | L_FCONN, "peer %d timed out, closing.", peer->tcpfd);
+ log_msg(LOG_INFO | LOG_FCONN, "peer %d timed out, closing.", peer->tcpfd);
oe_close(peer->tcpfd);
unlock_peer(peer);
delete_peer(peer);
@@ -941,7 +941,7 @@ void *ctrl_handler(void *p)
struct in6_addr in6;
if ((rlen = pthread_detach(pthread_self())))
- log_msg(L_ERROR, "thread couldn't self-detach: \"%s\"", strerror(rlen));
+ log_msg(LOG_ERR, "thread couldn't self-detach: \"%s\"", strerror(rlen));
log_debug("thread detached");
fd = (int) p;
@@ -949,7 +949,7 @@ void *ctrl_handler(void *p)
{
if (!(ff = fdopen(fd, "r+")))
{
- log_msg(L_ERROR, "could not open %d for writing: %s", fd, strerror(errno));
+ log_msg(LOG_ERR, "could not open %d for writing: %s", fd, strerror(errno));
return NULL;
}
log_debug("fd %d fdopen'ed", fd);
@@ -959,7 +959,7 @@ void *ctrl_handler(void *p)
{
if (!(ff = fdopen(fd, "r")))
{
- log_msg(L_ERROR, "could not open %d for reading: %s", fd, strerror(errno));
+ log_msg(LOG_ERR, "could not open %d for reading: %s", fd, strerror(errno));
CNF(config_read) = 1;
return NULL;
}
@@ -996,7 +996,7 @@ void *ctrl_handler(void *p)
if (!fgets(buf, FRAME_SIZE, ff))
{
if (!feof(ff))
- log_msg(L_ERROR, "error reading from %d");
+ log_msg(LOG_ERR, "error reading from %d");
break;
}
@@ -1036,14 +1036,14 @@ void *ctrl_handler(void *p)
for (peer = get_first_peer(); peer; peer = peer->next)
if (peer->tcpfd == cfd)
{
- log_msg(L_NOTICE | L_FCONN, "close request for %d", cfd);
+ log_msg(LOG_INFO | LOG_FCONN, "close request for %d", cfd);
oe_close(cfd);
delete_peer(peer);
break;
}
if (!peer)
{
- log_msg(L_NOTICE, "no peer with fd %d exists\n", cfd);
+ log_msg(LOG_INFO, "no peer with fd %d exists\n", cfd);
fprintf(fo, "no peer with fd %d exists\n", cfd);
}
unlock_peers();
@@ -1057,7 +1057,7 @@ void *ctrl_handler(void *p)
}
else if (!strcmp(buf, "terminate"))
{
- log_msg(L_NOTICE, "terminate request from control port");
+ log_msg(LOG_INFO, "terminate request from control port");
//FIXME: fds should be closed properly
exit(0);
}
@@ -1148,9 +1148,9 @@ void *ctrl_handler(void *p)
if (CNF(config_read))
fprintf(fo, "Good bye!\n");
- log_msg(L_NOTICE | L_FCONN, "closing session %d", fd);
+ log_msg(LOG_INFO | LOG_FCONN, "closing session %d", fd);
if (fclose(ff) == EOF)
- log_msg(L_ERROR, "error closing control stream: \"%s\"", strerror(errno));
+ log_msg(LOG_ERR, "error closing control stream: \"%s\"", strerror(errno));
// fclose also closes the fd according to the man page
if (!CNF(config_read))
diff --git a/src/ocatsetup.c b/src/ocatsetup.c
index 0fd5b54..ac25ce5 100644
--- a/src/ocatsetup.c
+++ b/src/ocatsetup.c
@@ -39,7 +39,9 @@ struct OcatSetup setup_ =
TOR_SOCKS_PORT, OCAT_LISTEN_PORT, OCAT_DEST_PORT, OCAT_CTRL_PORT,
//! default tunfd is stdin/stdout
{0, 1},
- 4, OCAT_UNAME, {0}, {{{0}}}, 0, 0, 1, OCAT_DIR, TUN_DEV,
+ //! default debug level
+ LOG_DEBUG,
+ OCAT_UNAME, {0}, {{{0}}}, 0, 0, 1, OCAT_DIR, TUN_DEV,
0, TOR_PREFIX4, TOR_PREFIX4_MASK,
NULL, 1,
0, // use_tap
diff --git a/src/ocatsocks.c b/src/ocatsocks.c
index 8892f54..1a18a28 100644
--- a/src/ocatsocks.c
+++ b/src/ocatsocks.c
@@ -79,7 +79,7 @@ int socks_connect(const SocksQueue_t *sq)
ipv6tonion(&sq->addr, onion);
strlcat(onion, ".onion", sizeof(onion));
- log_msg(L_NOTICE, "trying to connect to \"%s\" [%s]", onion, inet_ntop(AF_INET6, &sq->addr, buf, FRAME_SIZE));
+ log_msg(LOG_INFO, "trying to connect to \"%s\" [%s]", onion, inet_ntop(AF_INET6, &sq->addr, buf, FRAME_SIZE));
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
return E_SOCKS_SOCK;
@@ -87,7 +87,7 @@ int socks_connect(const SocksQueue_t *sq)
t = time(NULL);
if (connect(fd, (struct sockaddr*) &in, sizeof(in)) == -1)
{
- log_msg(L_ERROR, "connect() to TOR failed: \"%s\"", strerror(errno));
+ log_msg(LOG_ERR, "connect() to TOR failed: \"%s\"", strerror(errno));
oe_close(fd);
return E_SOCKS_CONN;
}
@@ -107,12 +107,12 @@ int socks_connect(const SocksQueue_t *sq)
len = sizeof(SocksHdr_t) + strlen(CNF(usrname)) + strlen(onion) + 2;
if (write(fd, shdr, len) != len)
// FIXME: there should be some additional error handling
- log_msg(L_ERROR, "couldn't write %d bytes to SOCKS connection %d", len, fd);
+ log_msg(LOG_ERR, "couldn't write %d bytes to SOCKS connection %d", len, fd);
log_debug("connect request sent");
if (read(fd, shdr, sizeof(SocksHdr_t)) < sizeof(SocksHdr_t))
{
- log_msg(L_ERROR | L_FCONN, "short read, closing.");
+ log_msg(LOG_ERR | LOG_FCONN, "short read, closing.");
oe_close(fd);
return E_SOCKS_REQ;
}
@@ -120,11 +120,11 @@ int socks_connect(const SocksQueue_t *sq)
if (shdr->ver || (shdr->cmd != 90))
{
- log_msg(L_ERROR, "request failed, reason = %d", shdr->cmd);
+ log_msg(LOG_ERR, "request failed, reason = %d", shdr->cmd);
oe_close(fd);
return E_SOCKS_RQFAIL;
}
- log_msg(L_NOTICE | L_FCONN, "connection to %s successfully opened on fd %d", onion, fd);
+ log_msg(LOG_INFO | LOG_FCONN, "connection to %s successfully opened on fd %d", onion, fd);
insert_peer(fd, sq, time(NULL) - t);
@@ -145,7 +145,7 @@ void socks_queue(const struct in6_addr *addr, int perm)
{
log_debug("queueing new SOCKS connection request");
if (!(squeue = calloc(1, sizeof(SocksQueue_t))))
- log_msg(L_FATAL, "could not get memory for SocksQueue entry: \"%s\"", strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "could not get memory for SocksQueue entry: \"%s\"", strerror(errno)), exit(1);
memcpy(&squeue->addr, addr, sizeof(struct in6_addr));
squeue->perm = perm;
squeue->next = socks_queue_;
@@ -166,7 +166,7 @@ void *socks_connector(void *p)
int i, rc, ps, run = 1;
if ((rc = pthread_detach(pthread_self())))
- log_msg(L_ERROR, "couldn't detach: \"%s\"", rc);
+ log_msg(LOG_ERR, "couldn't detach: \"%s\"", rc);
pthread_mutex_lock(&socks_queue_mutex_);
socks_thread_cnt_++;
@@ -202,7 +202,7 @@ void *socks_connector(void *p)
ps = socks_connect(*squeue);
//ps = socks_connect(&(*squeue)->addr);
else
- log_msg(L_NOTICE, "peer already exists, ignoring");
+ log_msg(LOG_INFO, "peer already exists, ignoring");
// remove request from queue after connect
log_debug("removing destination from SOCKS queue");
diff --git a/src/ocatthread.c b/src/ocatthread.c
index 5e4c32b..eb78be0 100644
--- a/src/ocatthread.c
+++ b/src/ocatthread.c
@@ -107,7 +107,7 @@ int run_ocat_thread(const char *name, void *(*thfunc)(void*), void *parm)
if (!(th = malloc(sizeof(OcatThread_t))))
{
rc = errno;
- log_msg(L_FATAL, "could not create thread %s: \"%s\"", name, strerror(errno));
+ log_msg(LOG_EMERG, "could not create thread %s: \"%s\"", name, strerror(errno));
return rc;
}
@@ -119,7 +119,7 @@ int run_ocat_thread(const char *name, void *(*thfunc)(void*), void *parm)
log_debug("starting [%s]", name);
if ((rc = pthread_create(&th->handle, NULL, thread_run, th)))
{
- log_msg(L_FATAL, "could not start thread %s: \"%s\"", name, strerror(rc));
+ log_msg(LOG_EMERG, "could not start thread %s: \"%s\"", name, strerror(rc));
free(th);
}
diff --git a/src/ocattun.c b/src/ocattun.c
index 26982f2..d66d777 100644
--- a/src/ocattun.c
+++ b/src/ocattun.c
@@ -65,7 +65,7 @@ int tun_alloc(char *dev, struct in6_addr addr)
log_debug("opening tun \"%s\"", tun_dev_);
if ((fd = open(tun_dev_, O_RDWR)) < 0)
- log_msg(L_FATAL, "could not open tundev %s: %s", tun_dev_, strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "could not open tundev %s: %s", tun_dev_, strerror(errno)), exit(1);
inet_ntop(AF_INET6, &addr, astr, INET6_ADDRSTRLEN);
inet_ntop(AF_INET, &CNF(ocat_addr4), astr4, INET_ADDRSTRLEN);
@@ -81,20 +81,20 @@ int tun_alloc(char *dev, struct in6_addr addr)
strncpy(ifr.ifr_name, dev, IFNAMSIZ);
if (ioctl(fd, TUNSETIFF, (void *) &ifr) < 0)
- log_msg(L_FATAL, "could not set TUNSETIFF: %s", strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "could not set TUNSETIFF: %s", strerror(errno)), exit(1);
strlcpy(dev, ifr.ifr_name, IFNAMSIZ);
if (!CNF(use_tap))
{
sprintf(buf, "ifconfig %s add %s/%d up", dev, astr, TOR_PREFIX_LEN);
- log_msg(L_NOTICE, "configuring tun IP: \"%s\"", buf);
+ log_msg(LOG_INFO, "configuring tun IP: \"%s\"", buf);
if (system(buf) == -1)
- log_msg(L_ERROR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+ log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
}
// according to drivers/net/tun.c only IFF_MULTICAST and IFF_PROMISC are supported.
/* ifr.ifr_flags = IFF_UP | IFF_RUNNING | IFF_MULTICAST | IFF_NOARP;
if (ioctl(fd, SIOCSIFFLAGS, (void*) &ifr) < 0)
- log_msg(L_ERROR, "could not set interface flags: \"%s\"", strerror(errno));
+ log_msg(LOG_ERR, "could not set interface flags: \"%s\"", strerror(errno));
*/
// set tun frame header to ethertype IPv6
@@ -111,10 +111,10 @@ int tun_alloc(char *dev, struct in6_addr addr)
int prm = 1;
if (ioctl(fd, TUNSIFHEAD, &prm) == -1)
- log_msg(L_FATAL, "could not ioctl:TUNSIFHEAD: %s", strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "could not ioctl:TUNSIFHEAD: %s", strerror(errno)), exit(1);
prm = IFF_POINTOPOINT;
if (ioctl(fd, TUNSIFMODE, &prm) == -1)
- log_msg(L_FATAL, "could not ioctl:TUNSIFMODE: %s", strerror(errno)), exit(1);
+ log_msg(LOG_EMERG, "could not ioctl:TUNSIFMODE: %s", strerror(errno)), exit(1);
#endif
@@ -123,7 +123,7 @@ int tun_alloc(char *dev, struct in6_addr addr)
sprintf(buf, "ifconfig tun0 inet6 %s/%d up", astr, TOR_PREFIX_LEN);
log_debug("setting IP on tun: \"%s\"", buf);
if (system(buf) == -1)
- log_msg(L_ERROR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+ log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
}
#endif
@@ -132,18 +132,18 @@ int tun_alloc(char *dev, struct in6_addr addr)
if (CNF(ipv4_enable) && !CNF(use_tap))
{
sprintf(buf, "ifconfig %s %s netmask %s", dev, astr4, inet_ntoa(netmask));
- log_msg(L_NOTICE, "configuring tun IP: \"%s\"", buf);
+ log_msg(LOG_INFO, "configuring tun IP: \"%s\"", buf);
if (system(buf) == -1)
- log_msg(L_ERROR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+ log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
}
// bring up tap device
if (CNF(use_tap))
{
sprintf(buf, "ifconfig %s up", dev);
- log_msg(L_NOTICE, "bringing up TAP device \"%s\"", buf);
+ log_msg(LOG_INFO, "bringing up TAP device \"%s\"", buf);
if (system(buf) == -1)
- log_msg(L_ERROR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+ log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
}
return fd;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git
More information about the Pkg-privacy-commits
mailing list