sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
227 discussions

git:master: cfg framework: @cfg_selected.group added
by Miklos Tirpak 31 Jan '11

31 Jan '11

Module: sip-router Branch: master Commit: f9ad9ccf83b9341fa5a063cb3bd844567f3f06e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9ad9cc… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jan 31 12:45:57 2011 +0100 cfg framework: @cfg_selected.group added @cfg_selected.<group_name> returns the selected instance id of the specified group. If no group instance is selected, i.e. the default is used, then empty string is returned. --- cfg/cfg_select.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++------- cfg/cfg_select.h | 3 ++ select_core.h | 2 + 3 files changed, 94 insertions(+), 13 deletions(-) diff --git a/cfg/cfg_select.c b/cfg/cfg_select.c index 68c7e41..cb0a2f1 100644 --- a/cfg/cfg_select.c +++ b/cfg/cfg_select.c @@ -60,14 +60,17 @@ static int cfg_new_select(str *gname, str *vname, void **group_p, void **var_p) if (!sel->gname.s) goto error; memcpy(sel->gname.s, gname->s, gname->len); sel->gname.len = gname->len; + sel->group_p = group_p; - sel->vname.s = (char *)pkg_malloc(sizeof(char)*vname->len); - if (!sel->vname.s) goto error; - memcpy(sel->vname.s, vname->s, vname->len); - sel->vname.len = vname->len; + if (vname) { + sel->vname.s = (char *)pkg_malloc(sizeof(char)*vname->len); + if (!sel->vname.s) goto error; + memcpy(sel->vname.s, vname->s, vname->len); + sel->vname.len = vname->len; + + sel->var_p = var_p; + } - sel->group_p = group_p; - sel->var_p = var_p; sel->next = cfg_non_fixed_selects; cfg_non_fixed_selects = sel; @@ -111,14 +114,23 @@ int cfg_fixup_selects() for (sel=cfg_non_fixed_selects; sel; sel=sel->next) { - if (cfg_lookup_var(&sel->gname, &sel->vname, &group, &var)) { - LOG(L_ERR, "ERROR: cfg_parse_selects(): unknown variable: %.*s.%.*s\n", - sel->gname.len, sel->gname.s, - sel->vname.len, sel->vname.s); - return -1; + if (sel->var_p) { + if (cfg_lookup_var(&sel->gname, &sel->vname, &group, &var)) { + LOG(L_ERR, "ERROR: cfg_parse_selects(): unknown variable: %.*s.%.*s\n", + sel->gname.len, sel->gname.s, + sel->vname.len, sel->vname.s); + return -1; + } + *(sel->group_p) = (void *)group; + *(sel->var_p) = (void *)var; + } else { + if (!(group = cfg_lookup_group(sel->gname.s, sel->gname.len))) { + LOG(L_ERR, "ERROR: cfg_parse_selects(): unknown configuration group: %.*s\n", + sel->gname.len, sel->gname.s); + return -1; + } + *(sel->group_p) = (void *)group; } - *(sel->group_p) = (void *)group; - *(sel->var_p) = (void *)var; } /* the select list is not needed anymore */ cfg_free_selects(); @@ -360,3 +372,67 @@ int read_cfg_var_str(struct cfg_read_handle *read_handle, str *val) *val = *(str *)(v2); return 0; } + +/* return the selected group instance */ +int cfg_selected_inst(str *res, select_t *s, struct sip_msg *msg) +{ + cfg_group_t *group; + cfg_group_inst_t *inst; + + if (msg == NULL) { + /* fixup call */ + + /* one parameter is mandatory: group name */ + if (s->n != 2) { + LOG(L_ERR, "ERROR: selected_inst(): One parameter is expected\n"); + return -1; + } + + if (s->params[1].type != SEL_PARAM_STR) { + LOG(L_ERR, "ERROR: selected_inst(): string parameter is expected\n"); + return -1; + } + + /* look-up the group and the variable */ + if (!(group = cfg_lookup_group(s->params[1].v.s.s, s->params[1].v.s.len))) { + if (cfg_shmized) { + LOG(L_ERR, "ERROR: selected_inst(): unknown configuration group: %.*s\n", + s->params[1].v.s.len, s->params[1].v.s.s); + return -1; + } + /* The group was not found, add it to the non-fixed select list. + * So we act as if the fixup was successful, and we retry it later */ + if (cfg_new_select(&s->params[1].v.s, NULL, + &s->params[1].v.p, NULL)) + return -1; + + LOG(L_DBG, "DEBUG: selected_inst(): select fixup is postponed: %.*s\n", + s->params[1].v.s.len, s->params[1].v.s.s); + + s->params[1].type = SEL_PARAM_PTR; + s->params[1].v.p = NULL; + + return 0; + } + + s->params[1].type = SEL_PARAM_PTR; + s->params[1].v.p = (void *)group; + + return 1; + } + + group = (cfg_group_t *)s->params[1].v.p; + if (!group) return -1; + + /* Get the current group instance from the group handle. */ + inst = CFG_HANDLE_TO_GINST(*(group->handle)); + + if (inst) { + res->s = int2str(inst->id, &res->len); + } else { + res->s = ""; + res->len = 0; + } + return 0; +} + diff --git a/cfg/cfg_select.h b/cfg/cfg_select.h index b7d454e..743b707 100644 --- a/cfg/cfg_select.h +++ b/cfg/cfg_select.h @@ -61,4 +61,7 @@ unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val); int read_cfg_var_int(struct cfg_read_handle *read_handle, int *val); int read_cfg_var_str(struct cfg_read_handle *read_handle, str *val); +/* return the selected group instance */ +int cfg_selected_inst(str *res, select_t *s, struct sip_msg *msg); + #endif /* _CFG_SELECT_H */ diff --git a/select_core.h b/select_core.h index d28e0e6..8cec775 100644 --- a/select_core.h +++ b/select_core.h @@ -215,6 +215,7 @@ SELECT_F(select_identity) SELECT_F(select_identity_info) SELECT_F(select_cfg_var) +SELECT_F(cfg_selected_inst) static select_row_t select_core[] = { { NULL, SEL_PARAM_STR, STR_STATIC_INIT("ruri"), select_ruri, 0}, /* not the same as request.uri because it is involved by new_uri */ @@ -410,6 +411,7 @@ static select_row_t select_core[] = { { NULL, SEL_PARAM_STR, STR_STATIC_INIT("identity_info"), select_identity_info, 0}, { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_get"), select_cfg_var, CONSUME_ALL | FIXUP_CALL }, + { NULL, SEL_PARAM_STR, STR_STATIC_INIT("cfg_selected"), cfg_selected_inst, CONSUME_NEXT_STR | FIXUP_CALL }, { NULL, SEL_PARAM_INT, STR_NULL, NULL, 0} };

1 0

kamailio and sip-router at FOSDEM 2011 - social event
by Henning Westerholt 31 Jan '11

31 Jan '11

Hello, in about two and a half week the annual open source developer conference FOSDEM (http://fosdem.org/2011/) takes place in Brussels. As in the last two years we would like to meet here for a social event, probably a dinner on Saturday evening, 6th February. This developers already confirmed their participance: - Daniel-Constantin Mierla - Marius Zbihlei - Henning Westerholt This year we'll also be present in the Open Source Telephony room on sunday with two talks, "Scaling location services in large SIP networks with Kamailio from Marius and myself, and "Unifying SIP and Web worlds with Lua (Kamailio)" from Daniel. Olivier Taylor agreed helping us again in choosing a nice place for the evening. Participation at the event is free of charge, everybody pays for its own expenses. In order to organize a restaurant and do a reservation please send me a short mail if you would like to attend. Looking forward to see you in Brussels! Best regards, Henning P.S.: Photos of the 2009 event can be found on the web site: http://www.kamailio.org/events/2009-FOSDEM/FOSDEM2009-Album/ -- Henning Westerholt - Head of IT Operations Internet Access & Communications 1&1 Internet AG, Karlsruhe, Germany

2 3

git:master: acc: fixed typo in example
by Daniel-Constantin Mierla 29 Jan '11

29 Jan '11

Module: sip-router Branch: master Commit: 8858e0d2c3c1c64f3223ae62aa2574a54d9fbc9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8858e0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 20:51:07 2011 +0100 acc: fixed typo in example - updated the route types where acc_*_request() can be used --- modules_k/acc/README | 12 ++++++------ modules_k/acc/doc/acc_admin.xml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules_k/acc/README b/modules_k/acc/README index 08ff24a..758c19f 100644 --- a/modules_k/acc/README +++ b/modules_k/acc/README @@ -863,7 +863,7 @@ modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)") Meaning of the parameters is as follows: * comment - Comment to be appended. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Example 1.35. acc_log_request usage ... @@ -880,12 +880,12 @@ acc_log_request("Some comment"); * comment - Comment to be appended. * table - Database table to be used. It can include config variables. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Example 1.36. acc_db_request usage ... -acc_log_request("Some comment", "some_table"); -acc_log_request("200 ok", "acc_cfg_$time(year)"); +acc_db_request("Some comment", "some_table"); +acc_db_request("200 ok", "acc_cfg_$time(year)"); ... 6.3. acc_rad_request(comment) @@ -896,7 +896,7 @@ acc_log_request("200 ok", "acc_cfg_$time(year)"); Meaning of the parameters is as follows: * comment - Comment to be appended. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Example 1.37. acc_rad_request usage ... @@ -911,7 +911,7 @@ acc_rad_request("Some comment"); Meaning of the parameters is as follows: * comment - Comment to be appended. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Example 1.38. acc_diam_request usage ... diff --git a/modules_k/acc/doc/acc_admin.xml b/modules_k/acc/doc/acc_admin.xml index 05bf63e..1401e47 100644 --- a/modules_k/acc/doc/acc_admin.xml +++ b/modules_k/acc/doc/acc_admin.xml @@ -972,7 +972,7 @@ modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)") </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title>acc_log_request usage</title> @@ -1006,14 +1006,14 @@ acc_log_request("Some comment"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title>acc_db_request usage</title> <programlisting format="linespecific"> ... -acc_log_request("Some comment", "some_table"); -acc_log_request("200 ok", "acc_cfg_$time(year)"); +acc_db_request("Some comment", "some_table"); +acc_db_request("200 ok", "acc_cfg_$time(year)"); ... </programlisting> </example> @@ -1037,7 +1037,7 @@ acc_log_request("200 ok", "acc_cfg_$time(year)"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title>acc_rad_request usage</title> @@ -1066,7 +1066,7 @@ acc_rad_request("Some comment"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title>acc_diam_request usage</title>

1 0

git:master: acc: take SIP method from CSeq header
by Daniel-Constantin Mierla 29 Jan '11

29 Jan '11

Module: sip-router Branch: master Commit: 7866c516bd3bf5c6befc8d978d02bf34ab338e3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7866c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 20:47:18 2011 +0100 acc: take SIP method from CSeq header - safe usage of acc_*_request() for requests & replies --- modules_k/acc/acc.c | 4 ++-- modules_k/acc/acc_mod.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/acc/acc.c b/modules_k/acc/acc.c index 271bdb3..189152b 100644 --- a/modules_k/acc/acc.c +++ b/modules_k/acc/acc.c @@ -125,8 +125,8 @@ int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals) struct hdr_field *from; struct hdr_field *to; - /* method */ - c_vals[0] = req->first_line.u.request.method; + /* method : request/reply - cseq parsed in acc_preparse_req() */ + c_vals[0] = get_cseq(req)->method; t_vals[0] = TYPE_STR; /* from/to URI and TAG */ diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index 6cfef81..ab5ab5b 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -193,21 +193,21 @@ static int free_acc_fixup(void** param, int param_no); static cmd_export_t cmds[] = { {"acc_log_request", (cmd_function)w_acc_log_request, 1, acc_fixup, free_acc_fixup, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, #ifdef SQL_ACC {"acc_db_request", (cmd_function)w_acc_db_request, 2, acc_fixup, free_acc_fixup, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, #endif #ifdef RAD_ACC {"acc_rad_request", (cmd_function)w_acc_rad_request, 1, acc_fixup, free_acc_fixup, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, #endif #ifdef DIAM_ACC {"acc_diam_request",(cmd_function)w_acc_diam_request,1, acc_fixup, free_acc_fixup, - REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, #endif {"bind_acc", (cmd_function)bind_acc, 0, 0, 0}, {0, 0, 0, 0, 0, 0}

1 0

git:master: textopsx: added remove_body() function
by Daniel-Constantin Mierla 29 Jan '11

29 Jan '11

Module: sip-router Branch: master Commit: 42fdf377b2af8f2944f4ff3722d4e54ac7c8202c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42fdf37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 19:13:44 2011 +0100 textopsx: added remove_body() function - remove the body of the sip request/reply - content-lenght is automatically adjusted - if you need to remove content-type, use remove_hf() --- modules/textopsx/textopsx.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index c20d1c0..0283699 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -41,12 +41,17 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); static int change_reply_status_f(struct sip_msg*, char*, char *); static int change_reply_status_fixup(void** param, int param_no); +static int w_remove_body_f(struct sip_msg*, char*, char *); + /* cfg functions */ static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, REQUEST_ROUTE }, {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, ONREPLY_ROUTE }, + {"remove_body", (cmd_function)w_remove_body_f, 0, + 0, ANY_ROUTE }, + {0,0,0,0,0} }; @@ -224,3 +229,30 @@ static int change_reply_status_f(struct sip_msg* msg, char* _code, char* _reason } +/** + * + */ +static int w_remove_body_f(struct sip_msg *msg, char *p1, char *p2) +{ + str body = {0,0}; + + body.len = 0; + body.s = get_body(msg); + if (body.s==0) + { + LM_DBG("no body in the message\n"); + return 1; + } + body.len = msg->buf + msg->len - body.s; + if (body.len<=0) + { + LM_DBG("empty body in the message\n"); + return 1; + } + if(del_lump(msg, body.s - msg->buf, body.len, 0) == 0) + { + LM_ERR("cannot remove body\n"); + return -1; + } + return 1; +}

1 0

git:master: textopsx: documented remove_body() function
by Daniel-Constantin Mierla 29 Jan '11

29 Jan '11

Module: sip-router Branch: master Commit: af13a0709188a91e0f714b7c481ede865452281d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af13a07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 19:18:22 2011 +0100 textopsx: documented remove_body() function --- modules/textopsx/README | 12 ++++++++++++ modules/textopsx/doc/functions.xml | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/modules/textopsx/README b/modules/textopsx/README index 73d894b..6e28690 100644 --- a/modules/textopsx/README +++ b/modules/textopsx/README @@ -17,6 +17,7 @@ Daniel-Constantin Mierla 1.2.1. msg_apply_changes() 1.2.2. change_reply_status(code, reason) + 1.2.3. remove_body() 1.1. Overview @@ -68,3 +69,14 @@ onreply_route { } } ... + +1.2.3. remove_body() + + Use this function to remove body of SIP requests or replies. + + This function can be used from ANY_ROUTE. + + Example 3. remove_body() usage +... +remove_body(); +... diff --git a/modules/textopsx/doc/functions.xml b/modules/textopsx/doc/functions.xml index 9d7d4f6..0e837a1 100644 --- a/modules/textopsx/doc/functions.xml +++ b/modules/textopsx/doc/functions.xml @@ -73,4 +73,25 @@ onreply_route { </example> </section> + <section id="textopsx.remove_body"> + <title> + <function moreinfo="none">remove_body()</function> + </title> + <para> + Use this function to remove body of SIP requests or replies. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_body()</function> usage</title> + <programlisting format="linespecific"> +... +remove_body(); +... +</programlisting> + </example> + </section> + + </section>

1 0

git:master: core: check for empty port values
by Daniel-Constantin Mierla 29 Jan '11

29 Jan '11

Module: sip-router Branch: master Commit: d260b2cba84e1699fe9b2c0860de91e018e03bca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d260b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 03:11:46 2011 +0100 core: check for empty port values - if setport has empty string parameter skip adding ':' --- action.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/action.c b/action.c index 9e8344f..268b3f5 100644 --- a/action.c +++ b/action.c @@ -991,8 +991,10 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) tmp=0; else if (a->type==SET_PORT_T) { tmp=a->val[0].u.string; - if (tmp) len = strlen(tmp); - else len = 0; + if (tmp) { + len = strlen(tmp); + if(len==0) tmp = 0; + } else len = 0; } else { tmp=uri.port.s; len = uri.port.len;

1 0

git:3.1: textops(k): handle no match for subst transformation
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: 604db10f6d8f952ab0989f159f62ddab77059e1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=604db10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 00:36:52 2011 +0100 textops(k): handle no match for subst transformation (cherry picked from commit c0f87c06f60e2208f5e4421e9002f331cacb8a27) --- modules_k/textops/txt_var.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/textops/txt_var.c b/modules_k/textops/txt_var.c index 4de2f63..ae1fce6 100644 --- a/modules_k/textops/txt_var.c +++ b/modules_k/textops/txt_var.c @@ -64,6 +64,11 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, result=subst_str(tr_txt_buf, msg, se, &nmatches); if (result == NULL) { + if (nmatches==0) + { + LM_DBG("no match for subst expression\n"); + return 0; + } if (nmatches<0) LM_ERR("subst failed\n"); return -1;

1 0

git:master: textops(k): handle no match for subst transformation
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: c0f87c06f60e2208f5e4421e9002f331cacb8a27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f87c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 29 00:36:52 2011 +0100 textops(k): handle no match for subst transformation --- modules_k/textops/txt_var.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/textops/txt_var.c b/modules_k/textops/txt_var.c index 4de2f63..ae1fce6 100644 --- a/modules_k/textops/txt_var.c +++ b/modules_k/textops/txt_var.c @@ -64,6 +64,11 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, result=subst_str(tr_txt_buf, msg, se, &nmatches); if (result == NULL) { + if (nmatches==0) + { + LM_DBG("no match for subst expression\n"); + return 0; + } if (nmatches<0) LM_ERR("subst failed\n"); return -1;

1 0

git:3.1: snmpstats: moved declaration of vars in .c file
by Daniel-Constantin Mierla 28 Jan '11

28 Jan '11

Module: sip-router Branch: 3.1 Commit: 16fa2cdd99515160ebe4133f26dcbac584021821 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16fa2cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 16:46:47 2011 +0100 snmpstats: moved declaration of vars in .c file (cherry picked from commit 8c26d7221cabe3c7c5b2f218b842c5886d830966) --- modules_k/snmpstats/snmpstats.c | 72 ++++++++++++++++++++++++++++++++++++++ modules_k/snmpstats/snmpstats.h | 73 --------------------------------------- 2 files changed, 72 insertions(+), 73 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 831251b..1994876 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -84,6 +84,15 @@ #include <net-snmp/net-snmp-includes.h> #include <net-snmp/agent/net-snmp-agent-includes.h> +#include "../../lib/kcore/statistics.h" +#include "../../sr_module.h" +#include "../../dprint.h" +#include "../../error.h" +#include "../../ut.h" +#include "../../script_cb.h" +#include "../../mem/mem.h" +#include "../../mem/shm_mem.h" + #include "snmpSIPRegUserTable.h" #include "snmpSIPContactTable.h" @@ -97,6 +106,69 @@ /* Required in every Kamailio Module. */ MODULE_VERSION +/*! This is the first function to be called by Kamailio, to initialize the module. + * This call must always return a value as soon as possible. If it were not to + * return, then Kamailio would not be able to initialize any of the other + * modules. */ +static int mod_init(void); + +/*! This function is called when Kamailio has finished creating all instances of + * itself. It is at this point that we want to create our AgentX sub-agent + * process, and register a handler for any state changes of our child. */ +static int mod_child_init(int rank); + + +/*! This function is called when Kamailio is shutting down. When this happens, we + * log a useful message and kill the AgentX Sub-Agent child process */ +static void mod_destroy(void); + + +static proc_export_t mod_procs[] = { + {"SNMP AgentX", 0, 0, agentx_child, 1 }, + {0,0,0,0,0} +}; + + +/*! + * This structure defines the SNMPStats parameters that can be configured + * through the kamailio.cfg configuration file. + */ +static param_export_t mod_params[] = +{ + { "sipEntityType", STR_PARAM|USE_FUNC_PARAM, + (void *)handleSipEntityType }, + { "MsgQueueMinorThreshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_queue_minor_threshold }, + { "MsgQueueMajorThreshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_queue_major_threshold }, + { "dlg_minor_threshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_dlg_minor_threshold }, + { "dlg_major_threshold", INT_PARAM|USE_FUNC_PARAM, + (void *)set_dlg_major_threshold }, + { "snmpgetPath", STR_PARAM|USE_FUNC_PARAM, + (void *)set_snmpget_path }, + { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM, + (void *)set_snmp_community }, + { 0,0,0 } +}; + + +struct module_exports exports = +{ + SNMPSTATS_MODULE_NAME, /* module's name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + mod_params, /* param exports */ + 0, /* exported statistics */ + 0, /* MI Functions */ + 0, /* pseudo-variables */ + mod_procs, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* reply processing function */ + mod_destroy, /* Destroy function */ + mod_child_init /* per-child init function */ +}; + /*! * The module will fork off a child process to run an snmp command via execve(). * We need a customized handler to ignore the SIGCHLD when the execve() diff --git a/modules_k/snmpstats/snmpstats.h b/modules_k/snmpstats/snmpstats.h index 75a0160..6b76a2d 100644 --- a/modules_k/snmpstats/snmpstats.h +++ b/modules_k/snmpstats/snmpstats.h @@ -65,81 +65,8 @@ #ifndef _SNMP_STATS_ #define _SNMP_STATS_ -#include "../../lib/kcore/statistics.h" -#include "../../sr_module.h" -#include "../../dprint.h" -#include "../../error.h" -#include "../../ut.h" -#include "../../script_cb.h" -#include "../../mem/mem.h" -#include "../../mem/shm_mem.h" -#include "snmpstats_globals.h" -#include "sub_agent.h" - #define SNMPSTATS_MODULE_NAME "snmpstats" #define SYSUPTIME_OID ".1.3.6.1.2.1.1.3.0" -/*! This is the first function to be called by Kamailio, to initialize the module. - * This call must always return a value as soon as possible. If it were not to - * return, then Kamailio would not be able to initialize any of the other - * modules. */ -static int mod_init(void); - -/*! This function is called when Kamailio has finished creating all instances of - * itself. It is at this point that we want to create our AgentX sub-agent - * process, and register a handler for any state changes of our child. */ -static int mod_child_init(int rank); - - -/*! This function is called when Kamailio is shutting down. When this happens, we - * log a useful message and kill the AgentX Sub-Agent child process */ -static void mod_destroy(void); - - -static proc_export_t mod_procs[] = { - {"SNMP AgentX", 0, 0, agentx_child, 1 }, - {0,0,0,0,0} -}; - - -/*! - * This structure defines the SNMPStats parameters that can be configured - * through the kamailio.cfg configuration file. - */ -static param_export_t mod_params[] = -{ - { "sipEntityType", STR_PARAM|USE_FUNC_PARAM, - (void *)handleSipEntityType }, - { "MsgQueueMinorThreshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_queue_minor_threshold }, - { "MsgQueueMajorThreshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_queue_major_threshold }, - { "dlg_minor_threshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_dlg_minor_threshold }, - { "dlg_major_threshold", INT_PARAM|USE_FUNC_PARAM, - (void *)set_dlg_major_threshold }, - { "snmpgetPath", STR_PARAM|USE_FUNC_PARAM, - (void *)set_snmpget_path }, - { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM, - (void *)set_snmp_community }, - { 0,0,0 } -}; - - -struct module_exports exports = -{ - SNMPSTATS_MODULE_NAME, /* module's name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - mod_params, /* param exports */ - 0, /* exported statistics */ - 0, /* MI Functions */ - 0, /* pseudo-variables */ - mod_procs, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* reply processing function */ - mod_destroy, /* Destroy function */ - mod_child_init /* per-child init function */ -}; #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011