summaryrefslogtreecommitdiff
path: root/accel-pptpd/ctrl
diff options
context:
space:
mode:
Diffstat (limited to 'accel-pptpd/ctrl')
-rw-r--r--accel-pptpd/ctrl/l2tp/l2tp.c15
-rw-r--r--accel-pptpd/ctrl/pppoe/pppoe.c71
-rw-r--r--accel-pptpd/ctrl/pptp/pptp.c33
3 files changed, 58 insertions, 61 deletions
diff --git a/accel-pptpd/ctrl/l2tp/l2tp.c b/accel-pptpd/ctrl/l2tp/l2tp.c
index bcd9a18..2314748 100644
--- a/accel-pptpd/ctrl/l2tp/l2tp.c
+++ b/accel-pptpd/ctrl/l2tp/l2tp.c
@@ -137,8 +137,7 @@ static void l2tp_disconnect(struct l2tp_conn_t *conn)
triton_event_fire(EV_CTRL_FINISHED, &conn->ppp);
- if (conf_verbose)
- log_ppp_info("disconnected\n");
+ log_ppp_info1("disconnected\n");
triton_context_unregister(&conn->ctx);
@@ -351,8 +350,8 @@ static int l2tp_tunnel_alloc(struct l2tp_serv_t *serv, struct l2tp_packet_t *pac
if (conf_verbose) {
log_switch(&conn->ctx, &conn->ppp);
- log_ppp_info("recv ");
- l2tp_packet_print(pack, log_ppp_info);
+ log_ppp_info2("recv ");
+ l2tp_packet_print(pack, log_ppp_info2);
}
triton_context_call(&conn->ctx, (triton_event_func)l2tp_send_SCCRP, conn);
@@ -472,8 +471,8 @@ static int l2tp_send(struct l2tp_conn_t *conn, struct l2tp_packet_t *pack, int l
log_ppp_debug("send ");
l2tp_packet_print(pack, log_ppp_debug);
} else {
- log_ppp_info("send ");
- l2tp_packet_print(pack, log_ppp_info);
+ log_ppp_info2("send ");
+ l2tp_packet_print(pack, log_ppp_info2);
}
}
@@ -917,8 +916,8 @@ static int l2tp_conn_read(struct triton_md_handler_t *h)
log_ppp_debug("recv ");
l2tp_packet_print(pack, log_ppp_debug);
} else {
- log_ppp_info("recv ");
- l2tp_packet_print(pack, log_ppp_info);
+ log_ppp_info2("recv ");
+ l2tp_packet_print(pack, log_ppp_info2);
}
}
diff --git a/accel-pptpd/ctrl/pppoe/pppoe.c b/accel-pptpd/ctrl/pppoe/pppoe.c
index 24d2405..d75df43 100644
--- a/accel-pptpd/ctrl/pppoe/pppoe.c
+++ b/accel-pptpd/ctrl/pppoe/pppoe.c
@@ -94,8 +94,7 @@ static void disconnect(struct pppoe_conn_t *conn)
triton_event_fire(EV_CTRL_FINISHED, &conn->ppp);
- if (conf_verbose)
- log_ppp_info("disconnected\n");
+ log_ppp_info1("disconnected\n");
pthread_mutex_lock(&conn->serv->lock);
conn->serv->conn[conn->sid] = NULL;
@@ -279,7 +278,7 @@ static void print_tag_string(struct pppoe_tag *tag)
int i;
for (i = 0; i < ntohs(tag->tag_len); i++)
- log_info("%c", tag->tag_data[i]);
+ log_info2("%c", tag->tag_data[i]);
}
static void print_tag_octets(struct pppoe_tag *tag)
@@ -287,7 +286,7 @@ static void print_tag_octets(struct pppoe_tag *tag)
int i;
for (i = 0; i < ntohs(tag->tag_len); i++)
- log_info("%02x", (uint8_t)tag->tag_data[i]);
+ log_info2("%02x", (uint8_t)tag->tag_data[i]);
}
static void print_packet(uint8_t *pack)
@@ -297,82 +296,82 @@ static void print_packet(uint8_t *pack)
struct pppoe_tag *tag;
int n;
- log_info("[PPPoE ");
+ log_info2("[PPPoE ");
switch (hdr->code) {
case CODE_PADI:
- log_info("PADI");
+ log_info2("PADI");
break;
case CODE_PADO:
- log_info("PADO");
+ log_info2("PADO");
break;
case CODE_PADR:
- log_info("PADR");
+ log_info2("PADR");
break;
case CODE_PADS:
- log_info("PADS");
+ log_info2("PADS");
break;
case CODE_PADT:
- log_info("PADT");
+ log_info2("PADT");
break;
}
- log_info(" %02x:%02x:%02x:%02x:%02x:%02x => %02x:%02x:%02x:%02x:%02x:%02x",
+ log_info2(" %02x:%02x:%02x:%02x:%02x:%02x => %02x:%02x:%02x:%02x:%02x:%02x",
ethhdr->h_source[0], ethhdr->h_source[1], ethhdr->h_source[2], ethhdr->h_source[3], ethhdr->h_source[4], ethhdr->h_source[5],
ethhdr->h_dest[0], ethhdr->h_dest[1], ethhdr->h_dest[2], ethhdr->h_dest[3], ethhdr->h_dest[4], ethhdr->h_dest[5]);
- log_info(" sid=%04x", ntohs(hdr->sid));
+ log_info2(" sid=%04x", ntohs(hdr->sid));
for (n = 0; n < ntohs(hdr->length); n += sizeof(*tag) + ntohs(tag->tag_len)) {
tag = (struct pppoe_tag *)(pack + ETH_HLEN + sizeof(*hdr) + n);
switch (ntohs(tag->tag_type)) {
case TAG_END_OF_LIST:
- log_info(" <End-Of-List>");
+ log_info2(" <End-Of-List>");
break;
case TAG_SERVICE_NAME:
- log_info(" <Service-Name ");
+ log_info2(" <Service-Name ");
print_tag_string(tag);
- log_info(">");
+ log_info2(">");
break;
case TAG_AC_NAME:
- log_info(" <AC-Name ");
+ log_info2(" <AC-Name ");
print_tag_string(tag);
- log_info(">");
+ log_info2(">");
break;
case TAG_HOST_UNIQ:
- log_info(" <Host-Uniq ");
+ log_info2(" <Host-Uniq ");
print_tag_octets(tag);
- log_info(">");
+ log_info2(">");
break;
case TAG_AC_COOKIE:
- log_info(" <AC-Cookie ");
+ log_info2(" <AC-Cookie ");
print_tag_octets(tag);
- log_info(">");
+ log_info2(">");
break;
case TAG_VENDOR_SPECIFIC:
- log_info(" <Vendor-Specific>");
+ log_info2(" <Vendor-Specific>");
break;
case TAG_RELAY_SESSION_ID:
- log_info(" <Relay-Session-Id");
+ log_info2(" <Relay-Session-Id");
print_tag_octets(tag);
- log_info(">");
+ log_info2(">");
break;
case TAG_SERVICE_NAME_ERROR:
- log_info(" <Service-Name-Error>");
+ log_info2(" <Service-Name-Error>");
break;
case TAG_AC_SYSTEM_ERROR:
- log_info(" <AC-System-Error>");
+ log_info2(" <AC-System-Error>");
break;
case TAG_GENERIC_ERROR:
- log_info(" <Generic-Error>");
+ log_info2(" <Generic-Error>");
break;
default:
- log_info(" <Unknown (%x)>", ntohs(tag->tag_type));
+ log_info2(" <Unknown (%x)>", ntohs(tag->tag_type));
break;
}
}
- log_info("]\n");
+ log_info2("]\n");
}
static void generate_cookie(const uint8_t *src, const uint8_t *dst, uint8_t *cookie)
@@ -464,7 +463,7 @@ static void pppoe_send_PADO(struct pppoe_serv_t *serv, const uint8_t *addr, cons
add_tag2(pack, relay_sid);
if (conf_verbose) {
- log_info("send ");
+ log_info2("send ");
print_packet(pack);
}
@@ -487,7 +486,7 @@ static void pppoe_send_err(struct pppoe_serv_t *serv, const uint8_t *addr, const
add_tag2(pack, relay_sid);
if (conf_verbose) {
- log_info("send ");
+ log_info2("send ");
print_packet(pack);
}
@@ -511,7 +510,7 @@ static void pppoe_send_PADS(struct pppoe_conn_t *conn)
add_tag2(pack, conn->relay_sid);
if (conf_verbose) {
- log_info("send ");
+ log_info2("send ");
print_packet(pack);
}
@@ -535,7 +534,7 @@ static void pppoe_send_PADT(struct pppoe_conn_t *conn)
add_tag2(pack, conn->relay_sid);
if (conf_verbose) {
- log_info("send ");
+ log_info2("send ");
print_packet(pack);
}
@@ -585,7 +584,7 @@ static void pppoe_recv_PADI(struct pppoe_serv_t *serv, uint8_t *pack, int size)
}
if (conf_verbose) {
- log_info("recv ");
+ log_info2("recv ");
print_packet(pack);
}
@@ -686,7 +685,7 @@ static void pppoe_recv_PADR(struct pppoe_serv_t *serv, uint8_t *pack, int size)
}
if (conf_verbose) {
- log_info("recv ");
+ log_info2("recv ");
print_packet(pack);
}
@@ -775,7 +774,7 @@ static void pppoe_recv_PADT(struct pppoe_serv_t *serv, uint8_t *pack)
}
if (conf_verbose) {
- log_info("recv ");
+ log_info2("recv ");
print_packet(pack);
}
diff --git a/accel-pptpd/ctrl/pptp/pptp.c b/accel-pptpd/ctrl/pptp/pptp.c
index 1523d99..8a1cbbe 100644
--- a/accel-pptpd/ctrl/pptp/pptp.c
+++ b/accel-pptpd/ctrl/pptp/pptp.c
@@ -90,8 +90,7 @@ static void disconnect(struct pptp_conn_t *conn)
triton_event_fire(EV_CTRL_FINISHED, &conn->ppp);
- if (conf_verbose)
- log_ppp_info("disconnected\n");
+ log_ppp_info1("disconnected\n");
triton_context_unregister(&conn->ctx);
@@ -120,7 +119,7 @@ static int post_msg(struct pptp_conn_t *conn, void *buf, int size)
else {
if (errno != EPIPE) {
if (conf_verbose)
- log_ppp_info("pptp: write: %s\n", strerror(errno));
+ log_ppp_info2("pptp: write: %s\n", strerror(errno));
return -1;
}
}
@@ -142,7 +141,7 @@ static int send_pptp_stop_ctrl_conn_rqst(struct pptp_conn_t *conn, int reason)
};
if (conf_verbose)
- log_ppp_info("send [PPTP Stop-Ctrl-Conn-Request <Reason %i>]\n", reason);
+ log_ppp_info2("send [PPTP Stop-Ctrl-Conn-Request <Reason %i>]\n", reason);
return post_msg(conn, &msg, sizeof(msg));
}
@@ -156,7 +155,7 @@ static int send_pptp_stop_ctrl_conn_rply(struct pptp_conn_t *conn, int reason, i
};
if (conf_verbose)
- log_ppp_info("send [PPTP Stop-Ctrl-Conn-Reply <Result %i> <Error %i>]\n", msg.reason_result, msg.error_code);
+ log_ppp_info2("send [PPTP Stop-Ctrl-Conn-Reply <Result %i> <Error %i>]\n", msg.reason_result, msg.error_code);
return post_msg(conn, &msg, sizeof(msg));
}
@@ -164,7 +163,7 @@ static int pptp_stop_ctrl_conn_rqst(struct pptp_conn_t *conn)
{
struct pptp_stop_ctrl_conn *msg = (struct pptp_stop_ctrl_conn *)conn->in_buf;
if (conf_verbose)
- log_ppp_info("recv [PPTP Stop-Ctrl-Conn-Request <Reason %i>]\n", msg->reason_result);
+ log_ppp_info2("recv [PPTP Stop-Ctrl-Conn-Request <Reason %i>]\n", msg->reason_result);
send_pptp_stop_ctrl_conn_rply(conn, PPTP_CONN_STOP_OK, 0);
@@ -175,7 +174,7 @@ static int pptp_stop_ctrl_conn_rply(struct pptp_conn_t *conn)
{
struct pptp_stop_ctrl_conn *msg = (struct pptp_stop_ctrl_conn*)conn->in_buf;
if (conf_verbose)
- log_ppp_info("recv [PPTP Stop-Ctrl-Conn-Reply <Result %i> <Error %i>]\n", msg->reason_result, msg->error_code);
+ log_ppp_info2("recv [PPTP Stop-Ctrl-Conn-Reply <Result %i> <Error %i>]\n", msg->reason_result, msg->error_code);
return -1;
}
@@ -199,7 +198,7 @@ static int send_pptp_start_ctrl_conn_rply(struct pptp_conn_t *conn, int res_code
strcpy((char*)msg.vendor, PPTP_VENDOR);
if (conf_verbose)
- log_ppp_info("send [PPTP Start-Ctrl-Conn-Reply <Version %i> <Result %i> <Error %i> <Framing %x> <Bearer %x> <Max-Chan %i>]\n", msg.version, msg.result_code, msg.error_code, ntohl(msg.framing_cap), ntohl(msg.bearer_cap), ntohs(msg.max_channels));
+ log_ppp_info2("send [PPTP Start-Ctrl-Conn-Reply <Version %i> <Result %i> <Error %i> <Framing %x> <Bearer %x> <Max-Chan %i>]\n", msg.version, msg.result_code, msg.error_code, ntohl(msg.framing_cap), ntohl(msg.bearer_cap), ntohs(msg.max_channels));
return post_msg(conn, &msg, sizeof(msg));
}
@@ -209,7 +208,7 @@ static int pptp_start_ctrl_conn_rqst(struct pptp_conn_t *conn)
struct pptp_start_ctrl_conn *msg = (struct pptp_start_ctrl_conn *)conn->in_buf;
if (conf_verbose)
- log_ppp_info("recv [PPTP Start-Ctrl-Conn-Request <Version %i> <Framing %x> <Bearer %x> <Max-Chan %i>]\n", msg->version, ntohl(msg->framing_cap), ntohl(msg->bearer_cap), ntohs(msg->max_channels));
+ log_ppp_info2("recv [PPTP Start-Ctrl-Conn-Request <Version %i> <Framing %x> <Bearer %x> <Max-Chan %i>]\n", msg->version, ntohl(msg->framing_cap), ntohl(msg->bearer_cap), ntohs(msg->max_channels));
if (conn->state != STATE_IDLE) {
log_ppp_warn("unexpected PPTP_START_CTRL_CONN_RQST\n");
@@ -256,7 +255,7 @@ static int send_pptp_out_call_rply(struct pptp_conn_t *conn, struct pptp_out_cal
};
if (conf_verbose)
- log_ppp_info("send [PPTP Outgoing-Call-Reply <Call-ID %x> <Peer-Call-ID %x> <Result %i> <Error %i> <Cause %i> <Speed %i> <Window-Size %i> <Delay %i> <Channel %x>]\n", ntohs(msg.call_id), ntohs(msg.call_id_peer), msg.result_code, msg.error_code, ntohs(msg.cause_code), ntohl(msg.speed), ntohs(msg.recv_size), ntohs(msg.delay), ntohl(msg.channel));
+ log_ppp_info2("send [PPTP Outgoing-Call-Reply <Call-ID %x> <Peer-Call-ID %x> <Result %i> <Error %i> <Cause %i> <Speed %i> <Window-Size %i> <Delay %i> <Channel %x>]\n", ntohs(msg.call_id), ntohs(msg.call_id_peer), msg.result_code, msg.error_code, ntohs(msg.cause_code), ntohl(msg.speed), ntohs(msg.recv_size), ntohs(msg.delay), ntohl(msg.channel));
return post_msg(conn, &msg, sizeof(msg));
}
@@ -270,7 +269,7 @@ static int pptp_out_call_rqst(struct pptp_conn_t *conn)
int pptp_sock;
if (conf_verbose)
- log_ppp_info("recv [PPTP Outgoing-Call-Request <Call-ID %x> <Call-Serial %x> <Min-BPS %i> <Max-BPS %i> <Bearer %x> <Framing %x> <Window-Size %i> <Delay %i>]\n", ntohs(msg->call_id), ntohs(msg->call_sernum), ntohl(msg->bps_min), ntohl(msg->bps_max), ntohl(msg->bearer), ntohl(msg->framing), ntohs(msg->recv_size), ntohs(msg->delay));
+ log_ppp_info2("recv [PPTP Outgoing-Call-Request <Call-ID %x> <Call-Serial %x> <Min-BPS %i> <Max-BPS %i> <Bearer %x> <Framing %x> <Window-Size %i> <Delay %i>]\n", ntohs(msg->call_id), ntohs(msg->call_sernum), ntohl(msg->bps_min), ntohl(msg->bps_max), ntohl(msg->bearer), ntohl(msg->framing), ntohs(msg->recv_size), ntohs(msg->delay));
if (conn->state != STATE_ESTB) {
log_ppp_warn("unexpected PPTP_OUT_CALL_RQST\n");
@@ -354,7 +353,7 @@ static int send_pptp_call_disconnect_notify(struct pptp_conn_t *conn, int result
};
if (conf_verbose)
- log_ppp_info("send [PPTP Call-Disconnect-Notify <Call-ID %x> <Result %i> <Error %i> <Cause %i>]\n", ntohs(msg.call_id), msg.result_code, msg.error_code, msg.cause_code);
+ log_ppp_info2("send [PPTP Call-Disconnect-Notify <Call-ID %x> <Result %i> <Error %i> <Cause %i>]\n", ntohs(msg.call_id), msg.result_code, msg.error_code, msg.cause_code);
return post_msg(conn, &msg, sizeof(msg));
}
@@ -364,7 +363,7 @@ static int pptp_call_clear_rqst(struct pptp_conn_t *conn)
struct pptp_call_clear_rqst *rqst = (struct pptp_call_clear_rqst *)conn->in_buf;
if (conf_verbose)
- log_ppp_info("recv [PPTP Call-Clear-Request <Call-ID %x>]\n", ntohs(rqst->call_id));
+ log_ppp_info2("recv [PPTP Call-Clear-Request <Call-ID %x>]\n", ntohs(rqst->call_id));
if (conn->state == STATE_PPP) {
__sync_sub_and_fetch(&stat_active, 1);
@@ -450,7 +449,7 @@ static int process_packet(struct pptp_conn_t *conn)
return pptp_call_clear_rqst(conn);
case PPTP_SET_LINK_INFO:
if (conf_verbose)
- log_ppp_info("recv [PPTP Set-Link-Info]\n");
+ log_ppp_info2("recv [PPTP Set-Link-Info]\n");
return 0;
default:
log_ppp_warn("recv [PPTP Unknown (%x)]\n", ntohs(hdr->ctrl_type));
@@ -476,7 +475,7 @@ static int pptp_read(struct triton_md_handler_t *h)
}
if (n == 0) {
if (conf_verbose)
- log_ppp_info("pptp: disconnect by peer\n");
+ log_ppp_info2("pptp: disconnect by peer\n");
goto drop;
}
conn->in_size += n;
@@ -524,7 +523,7 @@ static int pptp_write(struct triton_md_handler_t *h)
else {
if (errno != EPIPE) {
if (conf_verbose)
- log_ppp_info("pptp: post_msg: %s\n", strerror(errno));
+ log_ppp_info2("pptp: post_msg: %s\n", strerror(errno));
}
disconnect(conn);
return 1;
@@ -618,7 +617,7 @@ static int pptp_connect(struct triton_md_handler_t *h)
continue;
}
- log_info("pptp: new connection from %s\n", inet_ntoa(addr.sin_addr));
+ log_info2("pptp: new connection from %s\n", inet_ntoa(addr.sin_addr));
if (iprange_client_check(addr.sin_addr.s_addr)) {
log_warn("pptp: IP is out of client-ip-range, droping connection...\n");
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 13:06:20 +0000