Attention is currently required from: dexter.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31258 )
Change subject: bsc_subscriber_conn_fsm: use subslot 0 in case of E1 full subslot
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31258
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I0d2bc44acaa8e5a28cccfdf7cfb945bf14a4ed30
Gerrit-Change-Number: 31258
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 10 Feb 2023 11:26:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31268 )
Change subject: mgcp_endp: cosmetic: remove unnecessary new line
......................................................................
mgcp_endp: cosmetic: remove unnecessary new line
Change-Id: I5892bc2e07ab16356acb4e75c6f9c31f6604d41e
---
M src/libosmo-mgcp/mgcp_endp.c
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c
index 22dbeb7..03e5330 100644
--- a/src/libosmo-mgcp/mgcp_endp.c
+++ b/src/libosmo-mgcp/mgcp_endp.c
@@ -157,7 +157,6 @@
}
}
-
/*! Convert all characters in epname to lowercase and strip trunk prefix and
* endpoint name suffix (domain name) from epname. The result is written to
* to the memory pointed at by epname_stripped. The expected size of the
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31268
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I5892bc2e07ab16356acb4e75c6f9c31f6604d41e
Gerrit-Change-Number: 31268
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31267 )
Change subject: mgcp_endp: cosmetic move mgcp_endp_release to the end
......................................................................
mgcp_endp: cosmetic move mgcp_endp_release to the end
It is more logical to move the function mgcp_endp_release to the end
since it is used to release the endpoint when it is no longer needed for
any transmission. (Also the follow up patch requires the function to be
moved)
Change-Id: Id3166a6a817ddb9ce36ff1b375ff8ed3598a00c2
---
M include/osmocom/mgcp/mgcp_endp.h
M src/libosmo-mgcp/mgcp_endp.c
2 files changed, 32 insertions(+), 31 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h
index b130050..08b966f 100644
--- a/include/osmocom/mgcp/mgcp_endp.h
+++ b/include/osmocom/mgcp/mgcp_endp.h
@@ -130,7 +130,6 @@
};
struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index);
-void mgcp_endp_release(struct mgcp_endpoint *endp);
int mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid);
void mgcp_endp_update(struct mgcp_endpoint *endp);
bool mgcp_endp_is_wildcarded(const char *epname);
@@ -145,3 +144,4 @@
const struct mgcp_trunk *trunk);
struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname,
const struct mgcp_trunk *trunk);
+void mgcp_endp_release(struct mgcp_endpoint *endp);
diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c
index a41e0d0..22dbeb7 100644
--- a/src/libosmo-mgcp/mgcp_endp.c
+++ b/src/libosmo-mgcp/mgcp_endp.c
@@ -110,36 +110,6 @@
return endp;
}
-/*! release endpoint, all open connections are closed.
- * \param[in] endp endpoint to release */
-void mgcp_endp_release(struct mgcp_endpoint *endp)
-{
- LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "Releasing endpoint\n");
-
- /* Normally this function should only be called when
- * all connections have been removed already. In case
- * that there are still connections open (e.g. when
- * RSIP is executed), free them all at once. */
- mgcp_conn_free_all(endp);
-
- /* We must only decrement the stat item when the endpoint as actually
- * claimed. An endpoint is claimed when a call-id is set */
- if (endp->callid)
- osmo_stat_item_dec(osmo_stat_item_group_get_item(endp->trunk->stats.common,
- TRUNK_STAT_ENDPOINTS_USED), 1);
-
- /* Reset endpoint parameters and states */
- talloc_free(endp->callid);
- endp->callid = NULL;
- talloc_free(endp->local_options.string);
- endp->local_options.string = NULL;
- talloc_free(endp->local_options.codec);
- endp->local_options.codec = NULL;
-
- if (endp->trunk->trunk_type == MGCP_TRUNK_E1)
- mgcp_e1_endp_release(endp);
-}
-
/* Check if the endpoint name contains the prefix (e.g. "rtpbridge/" or
* "ds/e1-") and write the epname without the prefix back to the memory
* pointed at by epname. (per trunk the prefix is the same for all endpoints,
@@ -675,3 +645,34 @@
if (llist_empty(&endp->conns))
mgcp_endp_release(endp);
}
+
+/*! release endpoint, all open connections are closed.
+ * \param[in] endp endpoint to release */
+void mgcp_endp_release(struct mgcp_endpoint *endp)
+{
+ LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "Releasing endpoint\n");
+
+ /* Normally this function should only be called when
+ * all connections have been removed already. In case
+ * that there are still connections open (e.g. when
+ * RSIP is executed), free them all at once. */
+ mgcp_conn_free_all(endp);
+
+ /* We must only decrement the stat item when the endpoint as actually
+ * claimed. An endpoint is claimed when a call-id is set */
+ if (endp->callid)
+ osmo_stat_item_dec(osmo_stat_item_group_get_item(endp->trunk->stats.common,
+ TRUNK_STAT_ENDPOINTS_USED), 1);
+
+ /* Reset endpoint parameters and states */
+ talloc_free(endp->callid);
+ endp->callid = NULL;
+ talloc_free(endp->local_options.string);
+ endp->local_options.string = NULL;
+ talloc_free(endp->local_options.codec);
+ endp->local_options.codec = NULL;
+
+ if (endp->trunk->trunk_type == MGCP_TRUNK_E1)
+ mgcp_e1_endp_release(endp);
+}
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31267
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Id3166a6a817ddb9ce36ff1b375ff8ed3598a00c2
Gerrit-Change-Number: 31267
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged