[MERGED] libosmo-sccp[master]: introduce OSMO_SCCP_RI_NONE to indicate unset RI

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: introduce OSMO_SCCP_RI_NONE to indicate unset RI
......................................................................


introduce OSMO_SCCP_RI_NONE to indicate unset RI

Allows to automatically set an RI in future change
I75c67d289693f1c2a049ac61cf2b2097d6e5687d
"sccp-addr vty: set RI to SSN_PC when setting a point-code"

Change-Id: I6e2f31b023b08cba2f2ee8234e6108efcaca41c0
---
M include/osmocom/sigtran/sccp_sap.h
M src/osmo_ss7_vty.c
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h
index 90da686..13b1022 100644
--- a/include/osmocom/sigtran/sccp_sap.h
+++ b/include/osmocom/sigtran/sccp_sap.h
@@ -54,6 +54,7 @@
 
 /* Q.713 3.4.1 + RFC 3868 3.10.2.3 */
 enum osmo_sccp_routing_ind {
+	OSMO_SCCP_RI_NONE,
 	OSMO_SCCP_RI_GT,
 	OSMO_SCCP_RI_SSN_PC,
 	OSMO_SCCP_RI_SSN_IP,
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 164b7f2..b70f892 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -1048,6 +1048,11 @@
 		case OSMO_SCCP_RI_SSN_IP:
 			vty_out(vty, "  routing-indicator IP%s", VTY_NEWLINE);
 			break;
+		case OSMO_SCCP_RI_NONE:
+			break;
+		default:
+			vty_out(vty, "  ! invalid routing-indicator value: %u%s", entry->addr.ri, VTY_NEWLINE);
+			break;
 		}
 		if (entry->addr.presence & OSMO_SCCP_ADDR_T_PC)
 			vty_out(vty, "  point-code %s%s",

-- 
To view, visit https://gerrit.osmocom.org/3362
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e2f31b023b08cba2f2ee8234e6108efcaca41c0
Gerrit-PatchSet: 3
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder