pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sigtran/+/40249?usp=email )
Change subject: combined_linkset: Improve logging
......................................................................
combined_linkset: Improve logging
Change-Id: Ide1e72b9737a236561c7b6e86f381d929969346e
---
M src/osmo_ss7_combined_linkset.c
1 file changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran
refs/changes/49/40249/1
diff --git a/src/osmo_ss7_combined_linkset.c b/src/osmo_ss7_combined_linkset.c
index b4cd914..412555f 100644
--- a/src/osmo_ss7_combined_linkset.c
+++ b/src/osmo_ss7_combined_linkset.c
@@ -274,19 +274,22 @@
/* No normal route selected yet: */
if (!eslse->normal_rt) {
+ bool rt_avail;
/* Establish a Normal Route, regardless of available state: */
rt = ss7_combined_linkset_assign_route_roundrobin(clset);
/* No route found for Normal Route, regardless of state... */
if (!rt)
return NULL;
eslse->normal_rt = rt;
- LOGPCLSET(clset, DLSS7, LOGL_DEBUG, "RT loookup:
OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: "
- "picked Normal Route via '%s' round-robin style\n",
+ rt_avail = ss7_route_is_available(eslse->normal_rt);
+ LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT loookup:
OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: "
+ "picked Normal Route via '%s' round-robin style
(%s)\n",
rtlabel->opc, osmo_ss7_pointcode_print(inst,
rtlabel->opc),
rtlabel->dpc, osmo_ss7_pointcode_print2(inst,
rtlabel->dpc),
rtlabel->sls, esls,
- rt->dest.as ? rt->dest.as->cfg.name : "<linkset>");
- if (ss7_route_is_available(eslse->normal_rt)) {
+ rt->dest.as ? rt->dest.as->cfg.name : "<linkset>",
+ rt_avail ? "available" : "unavailable");
+ if (rt_avail) {
/* Found available Normal Route: */
return eslse->normal_rt;
}
@@ -306,6 +309,14 @@
rtlabel->sls, esls,
eslse->normal_rt->dest.as ?
eslse->normal_rt->dest.as->cfg.name : "<linkset>",
eslse->alt_rt->dest.as ?
eslse->alt_rt->dest.as->cfg.name : "<linkset>");
+ } else {
+ /* No alternative route found, NULL is returned. */
+ LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT Lookup:
OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: "
+ "Normal Route via '%s' unavailable, all Alternative
Routes unavailable\n",
+ rtlabel->opc, osmo_ss7_pointcode_print(inst,
rtlabel->opc),
+ rtlabel->dpc, osmo_ss7_pointcode_print2(inst,
rtlabel->dpc),
+ rtlabel->sls, esls,
+ eslse->normal_rt->dest.as ?
eslse->normal_rt->dest.as->cfg.name : "<linkset>");
}
return rt;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40249?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ide1e72b9737a236561c7b6e86f381d929969346e
Gerrit-Change-Number: 40249
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
