Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dialog module : new rpc function for terminate #555

Closed
wants to merge 7 commits into from
Closed

dialog module : new rpc function for terminate #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18f617d
dialog module : new rpc function for terminate
Mar 28, 2016
e606561
dialog module : rpc terminate dialog doc added
Mar 29, 2016
7cac43a
domain module : added rpc return code
Mar 29, 2016
f09e62a
dialog module: fixed response
Mar 29, 2016
9ae73dd
domain module : fixed response
Mar 29, 2016
f4d33dd
dialog module: fixes travis error
Mar 30, 2016
c26fb11
domain module : fixed typo
Mar 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 46 additions & 0 deletions modules/dialog/dialog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,6 +1698,9 @@ static const char *rpc_print_dlg_ctx_doc[2] = {
static const char *rpc_end_dlg_entry_id_doc[2] = {
"End a given dialog based on [h_entry] [h_id]", 0
};
static const char *rpc_dlg_terminate_dlg_doc[2] = {
"End a given dialog based on callid", 0
};
static const char *rpc_profile_get_size_doc[2] = {
"Returns the number of dialogs belonging to a profile", 0
};
Expand All @@ -1722,6 +1725,48 @@ static void rpc_print_dlg(rpc_t *rpc, void *c) {
static void rpc_print_dlg_ctx(rpc_t *rpc, void *c) {
internal_rpc_print_single_dlg(rpc, c, 1);
}
static void rpc_dlg_terminate_dlg(rpc_t *rpc,void *c){
str callid = {NULL,0};
str ftag = {NULL,0};
str ttag = {NULL,0};

dlg_cell_t * dlg = NULL;
unsigned int dir;
int ret=0;
dir = 0;


if(rpc->scan(c, ".S.S.S", &callid,&ftag,&ttag)<3)
{
LM_ERR("Unable to read the parameters dlg_terminate_dlg \n" );
rpc->fault(c, 400, "Need a Callid ,from tag ,to tag");
return;
}

dlg=get_dlg(&callid,&ftag,&ttag,&dir);

if(dlg==NULL){
LM_ERR("Couldnt find callid in dialog '%.*s' \n",callid.len, callid.s);
rpc->fault(c, 500, "Couldnt find callid in dialog");
return;
}

LM_DBG("Dialog is found with callid for terminate rpc '%.*s' \n",callid.len, callid.s);

ret=dlg_bye_all(dlg,NULL);

LM_DBG("Dialog bye return code %d \n",ret);

if(ret>=0){
LM_WARN("Dialog is terminated callid: '%.*s' \n",callid.len, callid.s);
dlg_release(dlg);
rpc->add(c, "d", 200);
rpc->add(c, "s", "OK");
rpc->send(c);
}
}


static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) {
unsigned int h_entry, h_id;
dlg_cell_t * dlg = NULL;
Expand Down Expand Up @@ -1812,5 +1857,6 @@ static rpc_export_t rpc_methods[] = {
{"dlg.profile_get_size", rpc_profile_get_size, rpc_profile_get_size_doc, 0},
{"dlg.profile_list", rpc_profile_print_dlgs, rpc_profile_print_dlgs_doc, RET_ARRAY},
{"dlg.bridge_dlg", rpc_dlg_bridge, rpc_dlg_bridge_doc, 0},
{"dlg.dlg_terminate_dlg", rpc_dlg_terminate_dlg, rpc_dlg_terminate_dlg_doc, 0},
{0, 0, 0, 0}
};
46 changes: 35 additions & 11 deletions modules/dialog/doc/dialog_admin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
<para>Name: <emphasis>dlg.list</emphasis></para>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg_list
kamcmd dlg_list
</programlisting>
</section>

Expand All @@ -2318,7 +2318,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
<para>Name: <emphasis>dlg.list_ctx</emphasis></para>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.list_ctx
kamcmd dlg.list_ctx
</programlisting>
</section>

Expand All @@ -2341,10 +2341,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
</itemizedlist>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.list abcdrssfrs122444@192.168.1.1 AAdfeEFF33
kamcmd dlg.list abcdrssfrs122444@192.168.1.1 AAdfeEFF33
</programlisting>
</section>

<section>
<title><varname>dlg.dlg_list_ctx</varname></title>
<para>
Expand All @@ -2357,10 +2356,36 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
</para>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.list_ctx abcdrssfrs122444@192.168.1.1 AAdfeEFF33
kamcmd dlg.list_ctx abcdrssfrs122444@192.168.1.1 AAdfeEFF33
</programlisting>
</section>
<section>
<title><varname>dlg.dlg_terminate_dlg</varname></title>
<para>
Terminates an ongoing dialog by sending BYE in both directions.
</para>
<para>Name: <emphasis>dlg.dlg_terminate_dlg</emphasis></para>
<para>Parameters:</para>
<itemizedlist>
<listitem><para>
<emphasis>callid</emphasis> - callid of dialog to be terminated
</para></listitem>
<listitem><para>
<emphasis>from_tag</emphasis> - from tag of the dialog to terminated
</para></listitem>
<listitem><para>
<emphasis>totag</emphasis> - to tag of the dialog to terminated
</para></listitem>
</itemizedlist>
<para>
Works only for confirmed dialogs
RPC command.
</para>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
kamcmd dlg.dlg_terminate_dlg callid12345callid asfromtag123 astotag123
</programlisting>
</section>

<section>
<title><varname>dlg.end_dlg</varname></title>
<para>
Expand Down Expand Up @@ -2388,10 +2413,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
</para>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.end_dlg 342 56
kamcmd dlg.end_dlg 342 56
</programlisting>
</section>

<section>
<title><varname>dlg.profile_get_size</varname></title>
<para>
Expand All @@ -2416,7 +2440,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
</itemizedlist>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.dlg.profile_get_size inbound_calls
kamcmd dlg.dlg.profile_get_size inbound_calls
</programlisting>
</section>

Expand Down Expand Up @@ -2444,7 +2468,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
</itemizedlist>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.profile_list inbound_calls
kamcmd dlg.profile_list inbound_calls
</programlisting>
</section>

Expand All @@ -2469,7 +2493,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)");
</itemizedlist>
<para>RPC Command Format:</para>
<programlisting format="linespecific">
serctl dlg.list from to op
kamcmd dlg.list from to op
</programlisting>
</section>
</section>
Expand Down
4 changes: 4 additions & 0 deletions modules/domain/domain_mod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@ static void domain_rpc_reload(rpc_t* rpc, void* ctx)
rpc->fault(ctx, 400, "Reload of domain tables failed");
}
lock_release(reload_lock);
rpc->add(ctx, "d", 200);
rpc->add(ctx, "s", "OK");
rpc->send(ctx);

}


Expand Down