[nat] Use and print the connection type of a SCCP connection.
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h
index b9a8c60..99a3aa6 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -124,6 +124,9 @@
struct sccp_source_reference remote_ref;
int has_remote_ref;
+ /* status */
+ int con_type;
+
/* GSM audio handling. That is 32 * multiplex + ts */
int crcx;
int msc_timeslot;
@@ -254,6 +257,8 @@
void sccp_connection_destroy(struct sccp_connections *);
void bsc_close_connection(struct bsc_connection *);
+const char *bsc_con_type_to_string(int type);
+
/**
* parse the given message into the above structure
*/
diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/nat/bsc_nat.c
index 9bfa54e..2351e8b 100644
--- a/openbsc/src/nat/bsc_nat.c
+++ b/openbsc/src/nat/bsc_nat.c
@@ -611,6 +611,7 @@
if (create_sccp_src_ref(bsc, msg, parsed) != 0)
goto exit2;
con = patch_sccp_src_ref_to_msc(msg, parsed, bsc);
+ con->con_type = con_type;
break;
case SCCP_MSG_TYPE_RLSD:
case SCCP_MSG_TYPE_CREF:
diff --git a/openbsc/src/nat/bsc_nat_utils.c b/openbsc/src/nat/bsc_nat_utils.c
index 616e52f..966eb3a 100644
--- a/openbsc/src/nat/bsc_nat_utils.c
+++ b/openbsc/src/nat/bsc_nat_utils.c
@@ -389,3 +389,16 @@
regcomp(reg, argv[0], 0);
}
}
+
+static const char *con_types [] = {
+ [NAT_CON_TYPE_NONE] = "n/a",
+ [NAT_CON_TYPE_LU] = "Location Update",
+ [NAT_CON_TYPE_CM_SERV_REQ] = "CM Serv Req",
+ [NAT_CON_TYPE_PAG_RESP] = "Paging Response",
+ [NAT_CON_TYPE_OTHER] = "Other",
+};
+
+const char *bsc_con_type_to_string(int type)
+{
+ return con_types[type];
+}
\ No newline at end of file
diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/nat/bsc_nat_vty.c
index 3e572ba..56cd3c4 100644
--- a/openbsc/src/nat/bsc_nat_vty.c
+++ b/openbsc/src/nat/bsc_nat_vty.c
@@ -95,7 +95,7 @@
vty_out(vty, "Listing all opening SCCP connections%s", VTY_NEWLINE);
llist_for_each_entry(con, &_nat->sccp_connections, list_entry) {
- vty_out(vty, "For BSC Nr: %d lac: %d; BSC ref: 0x%x; MUX ref: 0x%x; Network has ref: %d ref: 0x%x MSC/BSC mux: 0x%x/0x%x%s",
+ vty_out(vty, "For BSC Nr: %d lac: %d; BSC ref: 0x%x; MUX ref: 0x%x; Network has ref: %d ref: 0x%x MSC/BSC mux: 0x%x/0x%x type: %s%s",
con->bsc->cfg ? con->bsc->cfg->nr : -1,
con->bsc->cfg ? con->bsc->cfg->lac : -1,
sccp_src_ref_to_int(&con->real_ref),
@@ -103,6 +103,7 @@
con->has_remote_ref,
sccp_src_ref_to_int(&con->remote_ref),
con->msc_timeslot, con->bsc_timeslot,
+ bsc_con_type_to_string(con->con_type),
VTY_NEWLINE);
}