aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-26 17:31:53 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-08-09 13:53:26 +0200
commitb711e1450444c5882a8d9a941094183484fa47db (patch)
treefb87d6b64bc6d3bb59ea4299db00ce1debf0bea4
parent81a029a4e46bb7c62b2401ec055fe44c5b7568cd (diff)
add OSMO_SS7_PC_INVALID, add osmo_ss7_pc_is_valid()
Introduce OSMO_SS7_PC_INVALID to mark an unset point code. Add static osmo_ss7_pc_is_valid() (name matches schema of osmo_ss7_pc_is_local()). In osmo_ss7_pointcode_print(), return "(no PC)" if !osmo_ss7_pc_is_valid(), for convenient printing of any PC state. Subsequent patches will use this for osmo_ss7_instance (I7f0f0c89b7335d9da24161bfac8234be214ca00c) as well as osmo_sccp_user (I8684c9b559712072c772012890bbf7efa7c8eb35). Rationale: Currently, in osmo_ss7_vty.c we had "if (inst->cfg.primary_pc)" suggesting 0 is invalid, but in struct osmo_sccp_user we have flag pc_valid suggesting 0 is indeed valid. All known point code formats are <= 24bit, so we can easily use 0xffffffff as indicator for an unset PC, which removes the need to remember to set a second field for validity and keeps the structs nice and lean. Change-Id: Ib5715bf03a4de7713a7a809dfd821c700255ba8c
-rw-r--r--include/osmocom/sigtran/osmo_ss7.h8
-rw-r--r--src/osmo_ss7.c12
2 files changed, 17 insertions, 3 deletions
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index bbe425c..967912a 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -26,6 +26,14 @@ int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const c
const char *osmo_ss7_pointcode_print(struct osmo_ss7_instance *inst, uint32_t pc);
const char *osmo_ss7_pointcode_print2(struct osmo_ss7_instance *inst, uint32_t pc);
+/* All known point-code formats have a length of or below 24 bit.
+ * A point-code value exceeding that is used to indicate an unset PC. */
+#define OSMO_SS7_PC_INVALID 0xffffffff
+static inline bool osmo_ss7_pc_is_valid(uint32_t pc)
+{
+ return pc <= 0x00ffffff;
+}
+
/***********************************************************************
* SS7 Routing Tables
***********************************************************************/
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index eb5a4ef..6db3f14 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -247,10 +247,16 @@ err:
const char *_osmo_ss7_pointcode_print(char *buf, size_t len, struct osmo_ss7_instance *inst, uint32_t pc)
{
- const struct osmo_ss7_pc_fmt *pc_fmt = inst ? &inst->cfg.pc_fmt : &default_pc_fmt;
- unsigned int num_comp_exp = num_pc_comp_exp(pc_fmt);
- const char *fmtstr = gen_pc_fmtstr(pc_fmt, &num_comp_exp);
+ const struct osmo_ss7_pc_fmt *pc_fmt;
+ unsigned int num_comp_exp;
+ const char *fmtstr;
+
+ if (!osmo_ss7_pc_is_valid(pc))
+ return "(no PC)";
+ pc_fmt = inst ? &inst->cfg.pc_fmt : &default_pc_fmt;
+ num_comp_exp = num_pc_comp_exp(pc_fmt);
+ fmtstr = gen_pc_fmtstr(pc_fmt, &num_comp_exp);
OSMO_ASSERT(fmtstr);
snprintf(buf, len, fmtstr,
pc_comp_shift_and_mask(pc_fmt, 0, pc),