summaryrefslogtreecommitdiff
path: root/accel-pppd/log.c
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2014-12-01 16:40:04 +0300
committerDmitry Kozlov <xeb@mail.ru>2014-12-01 16:40:04 +0300
commit574912df113888ea19b4811b406612544514d9eb (patch)
treea7fec6d150d8710b31d4730ef7fab5c4c9ce4417 /accel-pppd/log.c
parent3cc7fd0165e096be25761710b66b44fda9d09190 (diff)
parente09279c7491a8bd16a25b123e03ddd0cd77b566d (diff)
downloadaccel-ppp-574912df113888ea19b4811b406612544514d9eb.tar.gz
accel-ppp-574912df113888ea19b4811b406612544514d9eb.zip
Merge branch 'master' of ssh://git.code.sf.net/p/accel-ppp/code
Diffstat (limited to 'accel-pppd/log.c')
-rw-r--r--accel-pppd/log.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/accel-pppd/log.c b/accel-pppd/log.c
index dcb2b113..0d481ad9 100644
--- a/accel-pppd/log.c
+++ b/accel-pppd/log.c
@@ -256,7 +256,7 @@ void __export log_free_msg(struct log_msg_t *m)
struct _log_msg_t *msg = (struct _log_msg_t *)m->lpd;
//printf("free msg %p\n", m);
-
+
mempool_free(m->hdr);
_log_free_msg(msg);
@@ -270,7 +270,7 @@ static void _log_free_msg(struct _log_msg_t *msg)
if (__sync_sub_and_fetch(&msg->refs, 1))
return;
-
+
while(!list_empty(&msg->chunks)) {
chunk = list_entry(msg->chunks.next, typeof(*chunk), entry);
list_del(&chunk->entry);
@@ -287,13 +287,13 @@ static struct log_msg_t *clone_msg(struct _log_msg_t *msg)
log_emerg("log: out of memory\n");
return NULL;
}
-
+
m->hdr = mempool_alloc(chunk_pool);
if (!m->hdr) {
log_emerg("log: out of memory\n");
mempool_free(m);
return NULL;
- }
+ }
m->hdr->len = 0;
m->lpd = msg;
@@ -311,14 +311,14 @@ static int add_msg(struct _log_msg_t *msg, const char *buf)
{
struct log_chunk_t *chunk;
int i, chunk_cnt, len = strlen(buf);
-
+
if (!list_empty(&msg->chunks)) {
chunk = list_entry(msg->chunks.prev, typeof(*chunk), entry);
i = min(len, LOG_CHUNK_SIZE - chunk->len);
memcpy(chunk->msg + chunk->len, buf, i);
chunk->len += i;
chunk->msg[chunk->len] = 0;
-
+
if (i == len)
return 0;
@@ -358,10 +358,10 @@ static void write_msg(FILE *f, struct _log_msg_t *msg, struct ap_session *ses)
if (ses)
fprintf(f, "%s: %s: ", ses->ifname, ses->sessionid);
-
+
list_for_each_entry(chunk, &msg->chunks, entry)
fwrite(chunk->msg, chunk->len, 1, f);
-
+
fflush(f);
pthread_mutex_unlock(&lock);
}
@@ -444,7 +444,7 @@ static void ev_ppp_authorized(struct ap_session *ses)
struct _log_msg_t *msg;
struct log_msg_t *m;
struct log_target_t *t;
-
+
list_for_each_entry(t, &targets, entry)
if (t->session_start)
t->session_start(ppp);