dingaopaicandu
/
osmo-bsc-nat
forked from cellular-infrastructure/osmo-bsc-nat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bsc_nat_fsm: tweak forwarding log messages 

Shorten them and don't use the LOG_SCCP macro anymore that will be
dropped in a follow-up patch. Change the level to DEBUG.

Related: SYS#5560
Change-Id: I85f65ad3c15a10958fbfe97aef00fc386e85ef63
This commit is contained in:
Oliver Smith 2022-03-09 14:40:29 +01:00
parent 1bee8ddae8
commit 6e4f7e9b2b
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/bsc_nat/bsc_nat.h
View File

@ -40,5 +40,7 @@ struct bsc_nat {
struct bsc_nat *bsc_nat_alloc(void *tall_ctx);
void bsc_nat_free(struct bsc_nat *bsc_nat);
const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr);
extern void *tall_bsc_nat_ctx;
extern struct bsc_nat *g_bsc_nat;

10
src/osmo-bsc-nat/bsc_nat.c
View File

@ -52,3 +52,13 @@ void bsc_nat_free(struct bsc_nat *bsc_nat)
talloc_free(bsc_nat);
}
const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr)
{
static char buf[25];
snprintf(buf, sizeof(buf), "PC=%s in %s", osmo_ss7_pointcode_print(NULL, addr->pc),
sccp_inst == g_bsc_nat->cn ? "CN" : "RAN");
return buf;
}

20
src/osmo-bsc-nat/bsc_nat_fsm.c
View File

@ -134,9 +134,7 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out));
msgb_pull_to_l2(oph->msg);
osmo_sccp_tx_conn_req(dest->scu, prim->u.connect.conn_id, &dest->local_sccp_addr, &peer_addr_out,
@ -153,9 +151,7 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out));
msgb_pull_to_l2(oph->msg);
osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data,
@ -168,9 +164,7 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out));
msgb_pull_to_l2(oph->msg);
osmo_sccp_tx_data(dest->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg));
@ -182,9 +176,7 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out));
osmo_sccp_tx_disconn(dest->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr,
prim->u.disconnect.cause);
@ -198,9 +190,7 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out));
/* oph->msg stores oph and unitdata msg. Move oph->msg->data to
* unitdata msg and send it again. */