[Asterisk-code-review] chan_dahdi: Add logical group at DAHDIChannel event and CHANNEL function (...asterisk[master])

[Kevin Harwell]

Kevin Harwell has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/11129 )

Change subject: chan_dahdi: Add logical group at DAHDIChannel event and CHANNEL function
......................................................................

chan_dahdi: Add logical group at DAHDIChannel event and CHANNEL function

Add logical group at DAHDIChannel event
and create "dahdi_group" at CHANNEL function.

ASTERISK-28317

Change-Id: Ic1f834cd53982a9707a9748395ee746d6575086a
---
M channels/chan_dahdi.c
1 file changed, 18 insertions(+), 4 deletions(-)

Approvals:
  Joshua C. Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved; Approved for Submit



diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 1eb618b..9f03042 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -185,6 +185,9 @@
 			<enum name="dahdi_span">
 				<para>R/O DAHDI span related to this channel.</para>
 			</enum>
+			<enum name="dahdi_group">
+				<para>R/O DAHDI logical group related to this channel.</para>
+			</enum>
 			<enum name="dahdi_type">
 				<para>R/O DAHDI channel type, one of:</para>
 				<enumlist>
@@ -462,6 +465,9 @@
 			<synopsis>Raised when a DAHDI channel is created or an underlying technology is associated with a DAHDI channel.</synopsis>
 			<syntax>
 				<channel_snapshot/>
+				<parameter name="DAHDIGroup">
+					<para>The DAHDI logical group associated with this channel.</para>
+				</parameter>
 				<parameter name="DAHDISpan">
 					<para>The DAHDI span associated with this channel.</para>
 				</parameter>
@@ -1727,21 +1733,24 @@
 {
 	RAII_VAR(struct ast_str *, channel_string, NULL, ast_free);
 	struct ast_channel_blob *obj = stasis_message_data(msg);
-	struct ast_json *span, *channel;
+	struct ast_json *group, *span, *channel;
 
 	channel_string = ast_manager_build_channel_state_string(obj->snapshot);
 	if (!channel_string) {
 		return NULL;
 	}
 
+	group = ast_json_object_get(obj->blob, "group");
 	span = ast_json_object_get(obj->blob, "span");
 	channel = ast_json_object_get(obj->blob, "channel");
 
 	return ast_manager_event_blob_create(EVENT_FLAG_CALL, "DAHDIChannel",
 		"%s"
+		"DAHDIGroup: %llu\r\n"
 		"DAHDISpan: %u\r\n"
 		"DAHDIChannel: %s\r\n",
 		ast_str_buffer(channel_string),
+		(ast_group_t)ast_json_integer_get(group),
 		(unsigned int)ast_json_integer_get(span),
 		ast_json_string_get(channel));
 }
@@ -1751,13 +1760,14 @@
 	);
 
 /*! \brief Sends a DAHDIChannel channel blob used to produce DAHDIChannel AMI messages */
-static void publish_dahdichannel(struct ast_channel *chan, int span, const char *dahdi_channel)
+static void publish_dahdichannel(struct ast_channel *chan, ast_group_t group, int span, const char *dahdi_channel)
 {
 	RAII_VAR(struct ast_json *, blob, NULL, ast_json_unref);
 
 	ast_assert(dahdi_channel != NULL);
 
-	blob = ast_json_pack("{s: i, s: s}",
+	blob = ast_json_pack("{s: i, s: i, s: s}",
+		"group", group,
 		"span", span,
 		"channel", dahdi_channel);
 	if (!blob) {
@@ -1793,7 +1803,7 @@
 		/* Real channel */
 		snprintf(ch_name, sizeof(ch_name), "%d", p->channel);
 	}
-	publish_dahdichannel(chan, p->span, ch_name);
+	publish_dahdichannel(chan, p->group, p->span, ch_name);
 }
 
 #ifdef HAVE_PRI
@@ -6692,6 +6702,10 @@
 		ast_mutex_lock(&p->lock);
 		snprintf(buf, len, "%d", p->span);
 		ast_mutex_unlock(&p->lock);
+	} else if (!strcasecmp(data, "dahdi_group")) {
+		ast_mutex_lock(&p->lock);
+		snprintf(buf, len, "%llu", p->group);
+		ast_mutex_unlock(&p->lock);
 	} else if (!strcasecmp(data, "dahdi_type")) {
 		ast_mutex_lock(&p->lock);
 		switch (p->sig) {

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/11129
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ic1f834cd53982a9707a9748395ee746d6575086a
Gerrit-Change-Number: 11129
Gerrit-PatchSet: 1
Gerrit-Owner: Cirillo Ferreira <cirillor at lbv.org.br>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Joshua C. Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190313/b628fa77/attachment.html>