sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: lib/srdb1/schema/rls_presentity.xml: content_type of rls_presentity table
by Juha Heinanen 10 Aug '11

10 Aug '11

Module: sip-router Branch: master Commit: 06faa586621c7ec0dd15654bc5e8b10153927ff9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06faa58… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Aug 10 15:46:47 2011 +0300 lib/srdb1/schema/rls_presentity.xml: content_type of rls_presentity table - Increased size of content_type field of rls_presentity table from 64 to 255, because 64 is too short for many actual content types. - Increased table version. --- lib/srdb1/schema/rls_presentity.xml | 6 +++--- modules_k/rls/rls.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/srdb1/schema/rls_presentity.xml b/lib/srdb1/schema/rls_presentity.xml index f413de4..fc29c2d 100644 --- a/lib/srdb1/schema/rls_presentity.xml +++ b/lib/srdb1/schema/rls_presentity.xml @@ -9,7 +9,7 @@ <table id="rls_presentity" xmlns:db="http://docbook.org/ns/docbook"> <name>rls_presentity</name> - <version>0</version> + <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Table for the RLS module. @@ -44,8 +44,8 @@ <column> <name>content_type</name> <type>string</type> - <size>&domain_len;</size> - <description>Event</description> + <size>255</size> + <description>Content type</description> </column> <column> diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index d82e76a..41d845b 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -57,7 +57,7 @@ MODULE_VERSION -#define P_TABLE_VERSION 0 +#define P_TABLE_VERSION 1 #define W_TABLE_VERSION 1 /** database connection */

1 0

git:master: core: added helper functions to return header by name
by Daniel-Constantin Mierla 09 Aug '11

09 Aug '11

Module: sip-router Branch: master Commit: a4485985596d64db6971b3c98a5c5e696e1e702a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a448598… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 9 22:51:40 2011 +0200 core: added helper functions to return header by name - for special cases when there is no defined type for the header --- parser/msg_parser.c | 37 +++++++++++++++++++++++++++++++------ parser/msg_parser.h | 6 ++++-- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index e138c7f..705c5fb 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -825,9 +825,9 @@ void reset_path_vector(struct sip_msg* msg) } -struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht) +hdr_field_t* get_hdr(sip_msg_t *msg, enum _hdr_types_t ht) { - struct hdr_field *hdr; + hdr_field_t *hdr; if (msg->parsed_flag & HDR_T2F(ht)) for(hdr = msg->headers; hdr; hdr = hdr->next) { @@ -837,12 +837,37 @@ struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht) } -struct hdr_field* next_sibling_hdr(struct hdr_field *hf) -{ - struct hdr_field *hdr; - +hdr_field_t* next_sibling_hdr(hdr_field_t *hf) +{ + hdr_field_t *hdr; + for(hdr = hf->next; hdr; hdr = hdr->next) { if(hdr->type == hf->type) return hdr; } return NULL; } + +hdr_field_t* get_hdr_by_name(sip_msg_t *msg, char *name, int name_len) +{ + hdr_field_t *hdr; + + for(hdr = msg->headers; hdr; hdr = hdr->next) { + if(hdr->name.len == name_len && *hdr->name.s==*name + && strncmp(hdr->name.s, name, name_len)==0) + return hdr; + } + return NULL; +} + + +hdr_field_t* next_sibling_hdr_by_name(hdr_field_t *hf) +{ + hdr_field_t *hdr; + + for(hdr = hf->next; hdr; hdr = hdr->next) { + if(hdr->name.len == hf->name.len && *hdr->name.s==*hf->name.s + && strncmp(hdr->name.s, hf->name.s, hf->name.len)==0) + return hdr; + } + return NULL; +} diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 4d8f58d..7f18eb1 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -441,8 +441,10 @@ int set_dst_uri(struct sip_msg* msg, str* uri); /*! \brief If the dst_uri is set to an URI then reset it */ void reset_dst_uri(struct sip_msg* msg); -struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht); -struct hdr_field* next_sibling_hdr(struct hdr_field *hf); +hdr_field_t* get_hdr(sip_msg_t *msg, enum _hdr_types_t ht); +hdr_field_t* next_sibling_hdr(hdr_field_t *hf); +hdr_field_t* get_hdr_by_name(sip_msg_t *msg, char *name, int name_len); +hdr_field_t* next_sibling_hdr_by_name(hdr_field_t *hf); int set_path_vector(struct sip_msg* msg, str* path);

1 0

Patches for siptrace
by Tristan Bruns 09 Aug '11

09 Aug '11

Hello OpenSER/Kamailio developers, we implemented some additional features in siptrace. The main objective was to have multiple kamailios send duplicates of sent/received packets to one logging server (also running kamailio). We did not just set db_url to the logging server because of performance concerns. The attached patches contain our commits. I hope that you find them useful. Viele Grüße / Best regards, Tristan Bruns (DECOIT GmbH) 0001-modules_k-siptrace-separately-store-to-db-and-or-sen.patch modules_k/siptrace: separately store to db and/or send duplicate 0002-modules_k-siptrace-Add-trace_to_database-configurati.patch modules_k/siptrace: Add trace_to_database configuration parameter Adding configuration parameter to disable writing to the database. We can use this to only duplicate the SIP messages without storing them in our database. 0003-modules_k-siptrace-Add-x-headers-feature.patch modules_k/siptrace: Add "x-headers" feature The "x-headers" feature stores the fromip, toip, method and direction in the message body (using X-* headers). This allows to transmit them using duplicate_uri from one kamailio to an other. 0004-modules_k-siptrace-Add-column-time_us.patch modules_k/siptrace: Add column time_us 0005-modules_k-siptrace-Add-time-to-x-headers.patch modules_k/siptrace: Add time to x-headers

2 2

git:master: modules_k/textops: Added new exported function append_time_to_request()
by Peter Dunkley 09 Aug '11

09 Aug '11

Module: sip-router Branch: master Commit: 233d01912e4ea5965fb68361f406aee0f650efac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=233d019… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 9 14:47:19 2011 +0100 modules_k/textops: Added new exported function append_time_to_request() - This function is similar to the existing append_time(), but the existing function adds the Date header to replies generated by Kamailio. This function modifies the request. In my scenario I want all MESSAGE requests to contain Date headers. The MSILO module inserts Date headers into MESSAGEs that have been stored, but not all clients insert Date headers. This function enables me to ensure all MESSAGE requests contain the Date header that I require. This is not exactly correct as the Date header should reflect the time when the request is first sent - but the current time on the Kamailio server is better than nothing and good enough for my needs. - Usage example: if (is_method("MESSAGE") && !is_present_hf("Date")) append_time_to_request(); --- modules_k/textops/README | 133 ++++++++++++++++++------------ modules_k/textops/doc/textops_admin.xml | 56 +++++++++++++ modules_k/textops/textops.c | 49 +++++++++++ 3 files changed, 185 insertions(+), 53 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=233…

1 0

git:master: core: allow negative parameter to remove_branches
by Alex Hermann 09 Aug '11

09 Aug '11

Module: sip-router Branch: master Commit: 5b258eb6c08898eb450cdf4819af4b2db1827868 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b258eb… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 5 15:32:14 2011 +0200 core: allow negative parameter to remove_branches --- cfg.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index daf38e0..0dc8b74 100644 --- a/cfg.y +++ b/cfg.y @@ -3200,7 +3200,7 @@ cmd: NUMBER_ST, (void *)Q_UNSPECIFIED); set_cfg_pos($$); } - | REMOVE_BRANCH LPAREN NUMBER RPAREN { + | REMOVE_BRANCH LPAREN intno RPAREN { $$=mk_action(REMOVE_BRANCH_T, 1, NUMBER_ST, (void*)$3); set_cfg_pos($$); }

1 0

git:master: modules_k/xcap_server: rolling back the addition of the xuiddomain pseudo-variable
by Peter Dunkley 09 Aug '11

09 Aug '11

Module: sip-router Branch: master Commit: a22807aeeda001fbf3471bdbd73966063e53ad2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a22807a… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 9 11:50:48 2011 +0100 modules_k/xcap_server: rolling back the addition of the xuiddomain pseudo-variable - As Juha has pointed out this change was unnecessary. The domain can be extracted from xuid using $(xcapuri(u=>xuid){uri.host}) --- modules_k/xcap_server/README | 2 +- modules_k/xcap_server/doc/xcap_server_admin.xml | 2 +- modules_k/xcap_server/xcap_misc.c | 13 ------------- modules_k/xcap_server/xcap_misc.h | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 88623e1..aca4a04 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -264,7 +264,7 @@ event_route[xhttp:request] { * $xcapuri(name=>key) - name can be any to idenitfy the XCAP uri; key can be: data, uri, root, auid, type, tree, xuid, file, node, - target, domain, xuiddomain. + target, domain. Exported pseudo-variables are documented at http://www.kamailio.org/dokuwiki/. diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index d83c7c5..c690557 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -307,7 +307,7 @@ event_route[xhttp:request] { <listitem><para> <emphasis>$xcapuri(name=>key)</emphasis> - name can be any to idenitfy the XCAP uri; key can be: data, uri, root, auid, - type, tree, xuid, file, node, target, domain, xuiddomain. + type, tree, xuid, file, node, target, domain. </para></listitem> </itemizedlist> <para> diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 06b5a57..57abf3f 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -238,13 +238,6 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) s.len -= xuri->xuid.len + 1; } - /* xuiddomain */ - if (xuri->xuid.len > 0) { - p = strchr(xuri->xuid.s, '@'); - xuri->xuiddomain.s = p + 1; - xuri->xuiddomain.len = xuri->xuid.len - (p - xuri->xuid.s) - 1; - } - /* file */ xuri->file.s = s.s; if(xuri->nss==NULL) { @@ -754,8 +747,6 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in) pxs->ktype = 9; } else if(pxs->key.len==6 && strncmp(pxs->key.s, "domain", 6)==0) { pxs->ktype = 10; - } else if(pxs->key.len==10 && strncmp(pxs->key.s, "xuiddomain", 10)==0) { - pxs->ktype = 11; } else { LM_ERR("unknown key type [%.*s]\n", in->len, in->s); goto error; @@ -859,10 +850,6 @@ int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, /* get domain */ if(pxs->xus->xuri.domain.len>0) return pv_get_strval(msg, param, res, &pxs->xus->xuri.domain); - case 11: - /* get xuiddomain */ - if(pxs->xus->xuri.xuiddomain.len>0) - return pv_get_strval(msg, param, res, &pxs->xus->xuri.xuiddomain); break; default: return pv_get_null(msg, param, res); diff --git a/modules_k/xcap_server/xcap_misc.h b/modules_k/xcap_server/xcap_misc.h index 908d592..4fcd3d1 100644 --- a/modules_k/xcap_server/xcap_misc.h +++ b/modules_k/xcap_server/xcap_misc.h @@ -48,7 +48,6 @@ typedef struct xcap_uri { str node; str target; str domain; - str xuiddomain; } xcap_uri_t; int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri);

1 0

git:master: modules_k/auth_radius: added optional uri_user param to radius_www_authorize()
by Juha Heinanen 09 Aug '11

09 Aug '11

Module: sip-router Branch: master Commit: 414af8a49bae2a41069b003aa9da83823c729bd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=414af8a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Aug 9 08:36:39 2011 +0300 modules_k/auth_radius: added optional uri_user param to radius_www_authorize() - Useful for http authorization. --- modules_k/auth_radius/README | 13 +++++++++---- modules_k/auth_radius/authorize.c | 14 ++++++++++++-- modules_k/auth_radius/authorize.h | 15 ++++++++++----- modules_k/auth_radius/authrad_mod.c | 4 +++- modules_k/auth_radius/doc/auth_radius_admin.xml | 13 ++++++++++++- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/modules_k/auth_radius/README b/modules_k/auth_radius/README index 3222d50..e40fa57 100644 --- a/modules_k/auth_radius/README +++ b/modules_k/auth_radius/README @@ -49,7 +49,7 @@ Jan Janak 5. Exported Functions - 5.1. radius_www_authorize(realm) + 5.1. radius_www_authorize(realm [, uri_user]) 5.2. radius_proxy_authorize(realm [, uri_user]) List of Examples @@ -82,7 +82,7 @@ Chapter 1. Admin Guide 5. Exported Functions - 5.1. radius_www_authorize(realm) + 5.1. radius_www_authorize(realm [, uri_user]) 5.2. radius_proxy_authorize(realm [, uri_user]) 1. Overview @@ -206,10 +206,10 @@ modparam("auth_radius", "use_ruri_flag", 22) 5. Exported Functions - 5.1. radius_www_authorize(realm) + 5.1. radius_www_authorize(realm [, uri_user]) 5.2. radius_proxy_authorize(realm [, uri_user]) -5.1. radius_www_authorize(realm) +5.1. radius_www_authorize(realm [, uri_user]) The function verifies credentials according to RFC2617. If the credentials are verified successfully then the function will succeed @@ -240,6 +240,11 @@ modparam("auth_radius", "use_ruri_flag", 22) to the user so he can decide what username and password to use. In case of REGISTER requests it is usually hostpart of To URI. The string may contain pseudo variables. + * uri_user - Uri_user is an optional pseudo variable parameter whose + value, if present, will be given to Radius server as value of + SIP-URI-User check item. If uri_user pseudo variable parameter is + not present, the server will generate SIP-URI-User check item value + from user part of To/From URI. This function can be used from REQUEST_ROUTE. diff --git a/modules_k/auth_radius/authorize.c b/modules_k/auth_radius/authorize.c index c84deec..9dfc9b3 100644 --- a/modules_k/auth_radius/authorize.c +++ b/modules_k/auth_radius/authorize.c @@ -236,10 +236,20 @@ int radius_proxy_authorize_2(struct sip_msg* _msg, char* _realm, /* - * Authorize using WWW-Authorize header field + * Authorize using WWW-Authorize header field (no URI user parameter given) */ -int radius_www_authorize(struct sip_msg* _msg, char* _realm, char* _s2) +int radius_www_authorize_1(struct sip_msg* _msg, char* _realm, char* _s2) { return authorize(_msg, (pv_elem_t*)_realm, (pv_spec_t *)0, HDR_AUTHORIZATION_T); } + + +/* + * Authorize using WWW-Authorize header field (URI user parameter given) + */ +int radius_www_authorize_2(struct sip_msg* _msg, char* _realm, char* _uri_user) +{ + return authorize(_msg, (pv_elem_t*)_realm, (pv_spec_t *)_uri_user, + HDR_AUTHORIZATION_T); +} diff --git a/modules_k/auth_radius/authorize.h b/modules_k/auth_radius/authorize.h index 33cfb5f..014ed9d 100644 --- a/modules_k/auth_radius/authorize.h +++ b/modules_k/auth_radius/authorize.h @@ -33,21 +33,26 @@ /* - * Authorize using Proxy-Authorize header field (no from parameter given) + * Authorize using Proxy-Authorize header field (no URI user parameter given) */ int radius_proxy_authorize_1(struct sip_msg* _msg, char* _realm, char* _s2); /* - * Authorize using Proxy-Authorize header field (from parameter given) + * Authorize using Proxy-Authorize header field (URI user parameter given) */ -int radius_proxy_authorize_2(struct sip_msg* _msg, char* _realm, char* _from); +int radius_proxy_authorize_2(struct sip_msg* _msg, char* _realm, char* _uri_user); /* - * Authorize using WWW-Authorization header field + * Authorize using WWW-Authorization header field (no URI user parameter given) */ -int radius_www_authorize(struct sip_msg* _msg, char* _realm, char* _s2); +int radius_www_authorize_1(struct sip_msg* _msg, char* _realm, char* _s2); + +/* + * Authorize using WWW-Authorization header field (URI user parameter given) + */ +int radius_www_authorize_2(struct sip_msg* _msg, char* _realm, char* _uri_user); #endif /* AUTHORIZE_H */ diff --git a/modules_k/auth_radius/authrad_mod.c b/modules_k/auth_radius/authrad_mod.c index 59e27c5..f0ef531 100644 --- a/modules_k/auth_radius/authrad_mod.c +++ b/modules_k/auth_radius/authrad_mod.c @@ -73,7 +73,9 @@ struct extra_attr *auth_extra = 0; * Exported functions */ static cmd_export_t cmds[] = { - {"radius_www_authorize", (cmd_function)radius_www_authorize, 1, auth_fixup, + {"radius_www_authorize", (cmd_function)radius_www_authorize_1, 1, auth_fixup, + 0, REQUEST_ROUTE}, + {"radius_www_authorize", (cmd_function)radius_www_authorize_2, 2, auth_fixup, 0, REQUEST_ROUTE}, {"radius_proxy_authorize", (cmd_function)radius_proxy_authorize_1, 1, auth_fixup, 0, REQUEST_ROUTE}, diff --git a/modules_k/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml index eb99ca8..699d454 100644 --- a/modules_k/auth_radius/doc/auth_radius_admin.xml +++ b/modules_k/auth_radius/doc/auth_radius_admin.xml @@ -193,7 +193,7 @@ modparam("auth_radius", "use_ruri_flag", 22) <section> <title>Exported Functions</title> <section> - <title><function moreinfo="none">radius_www_authorize(realm)</function></title> + <title><function moreinfo="none">radius_www_authorize(realm [, uri_user])</function></title> <para> The function verifies credentials according to <ulink url="http://www.ietf.org/rfc/rfc2617.txt">RFC2617</ulink>. If @@ -253,6 +253,17 @@ modparam("auth_radius", "use_ruri_flag", 22) The string may contain pseudo variables. </para> </listitem> + <listitem> + <para><emphasis>uri_user</emphasis> - Uri_user is an + optional pseudo variable parameter whose value, if + present, will be given to Radius server as value of + SIP-URI-User check item. + If uri_user pseudo variable parameter is not + present, the server will generate + SIP-URI-User check item value from user part of + To/From URI. + </para> + </listitem> </itemizedlist> <para> This function can be used from REQUEST_ROUTE.

1 0

git:alexh/master: modules/tm: Make 487 a prioritized reply code too
by Alex Hermann 08 Aug '11

08 Aug '11

Module: sip-router Branch: alexh/master Commit: b668c7f441df0c3de4ffcd6e96e6232059591239 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b668c7f… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Jul 19 12:27:04 2011 +0200 modules/tm: Make 487 a prioritized reply code too --- modules/tm/t_reply.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4b9c581..8f31688 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -998,6 +998,7 @@ inline static short int get_4xx_prio(unsigned char xx) case 15: case 20: case 84: + case 87: return xx; break; }

4 6

git:master: db_postgres: fix doxygen errors, small extensions and cleanups in comments
by Henning Westerholt 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 34db39d95f9fcb03d5624ee6fb15b8542295a2f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34db39d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Aug 8 22:42:19 2011 +0200 db_postgres: fix doxygen errors, small extensions and cleanups in comments --- modules/db_postgres/km_pg_con.c | 2 - modules/db_postgres/pg_cmd.h | 23 +++++++--------- modules/db_postgres/pg_fld.c | 17 +++--------- modules/db_postgres/pg_fld.h | 53 ++++++++++++++++++-------------------- 4 files changed, 40 insertions(+), 55 deletions(-) diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index 98dbb43..472e8de 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2004 iptel.org * Copyright (C) 2008 1&1 Internet AG * diff --git a/modules/db_postgres/pg_cmd.h b/modules/db_postgres/pg_cmd.h index 1398d16..c48c31e 100644 --- a/modules/db_postgres/pg_cmd.h +++ b/modules/db_postgres/pg_cmd.h @@ -1,8 +1,4 @@ /* - * $Id$ - * - * PostgreSQL Database Driver for SER - * * Portions Copyright (C) 2001-2003 FhG FOKUS * Copyright (C) 2003 August.Net Services, LLC * Portions Copyright (C) 2005-2008 iptelorg GmbH @@ -31,13 +27,15 @@ #ifndef _PG_CMD_H #define _PG_CMD_H -/** \addtogroup postgres - * @{ - */ -/** \file - * Declaration of pg_cmd data structure that contains PostgreSQL specific data +/*! + * \file + * \brief DB_POSTGRES :: * Declaration of pg_cmd data structure + * + * Declaration of pg_cmd data structure that contains PostgreSQL specific data * stored in db_cmd structures and related functions. + * \ingroup db_postgres + * Module: \ref db_postgres */ #include "pg_oid.h" @@ -90,6 +88,7 @@ int pg_cmd(db_cmd_t* cmd); * necessary. * @param res A pointer to (optional) result structure if the command returns * a result. + * @param cmd executed command * @retval 0 if executed successfully * @retval A negative number if the database server failed to execute command * @retval A positive number if there was an error on client side (SER) @@ -106,7 +105,7 @@ int pg_cmd_exec(db_res_t* res, db_cmd_t* cmd); * @param res A result set retrieved from PostgreSQL server. * @retval 0 If executed successfully. * @retval 1 If the result is empty. - * @retival A negative number on error. + * @retval A negative number on error. */ int pg_cmd_first(db_res_t* res); @@ -120,7 +119,7 @@ int pg_cmd_first(db_res_t* res); * @param res A result set retrieved from PostgreSQL server. * @retval 0 If executed successfully. * @retval 1 If there are no more records in the result. - * @retival A negative number on error. + * @retval A negative number on error. */ int pg_cmd_next(db_res_t* res); @@ -150,6 +149,4 @@ int pg_getopt(db_cmd_t* cmd, char* optname, va_list ap); */ int pg_setopt(db_cmd_t* cmd, char* optname, va_list ap); -/** @} */ - #endif /* _PG_CMD_H */ diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 685d73b..fe64217 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -1,8 +1,4 @@ /* - * $Id$ - * - * PostgreSQL Database Driver for SER - * * Portions Copyright (C) 2001-2003 FhG FOKUS * Copyright (C) 2003 August.Net Services, LLC * Portions Copyright (C) 2005-2008 iptelorg GmbH @@ -28,12 +24,12 @@ * Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/** \addtogroup postgres - * @{ - */ -/** \file - * Data field conversion and type checking functions. +/*! + * \file + * \brief DB_POSTGRES :: Data field conversion and type checking functions. + * \ingroup db_postgres + * Module: \ref db_postgres */ #include "pg_fld.h" @@ -934,6 +930,3 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, type, dst[i].type); return -1; } - - -/** @} */ diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index 917f22d..09b9926 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -1,8 +1,4 @@ /* - * $Id$ - * - * PostgreSQL Database Driver for SER - * * Portions Copyright (C) 2001-2003 FhG FOKUS * Copyright (C) 2003 August.Net Services, LLC * Portions Copyright (C) 2005-2008 iptelorg GmbH @@ -31,13 +27,14 @@ #ifndef _PG_FLD_H #define _PG_FLD_H -/** \addtogroup postgres - * @{ - */ -/** \file - * Implementation of pg_fld data structure representing PostgreSQL fields and - * related functions. +/*! + * \file + * \brief DB_POSTGRES :: Implementation of pg_fld data structure + * + * Implementation of pg_fld data structure representing PostgreSQL fields and related functions. + * \ingroup db_postgres + * Module: \ref db_postgres */ #include "pg_oid.h" @@ -75,8 +72,7 @@ struct pg_fld { * attaches the structure to the generic db_fld structure. * @param fld A generic db_fld structure to be exended. * @param table Name of the table on the server. - * @retval 0 on success. - * @retval A negative number on error. + * @return 0 on success, negative number on error. */ int pg_fld(db_fld_t* fld, char* table); @@ -89,15 +85,11 @@ int pg_resolve_result_oids(db_fld_t* fld, int n, PGresult* res); /** Converts arrays of db_fld fields to PostgreSQL parameters. * The function converts fields in SER db_fld format to parameters suitable * for PostgreSQL API functions. - * @param values An array of pointers to values in PostgreSQL format. The + * @param dst An array of pointers to values in PostgreSQL format. The * function will store pointers to converted values there. - * @param lenghts An array of integers that will be filled with lenghts - * of values. - * @param formats An array of value formats, see PostgreSQL API client - * library documentation for more detail. - * @param oids Types of corresponding columns on the server. + * @param off offset * @param types A type conversion table. - * @param fld An array of db_fld fields to be converted. + * @param src An array of db_fld fields to be converted. * @param flags Connection flags controlling how values are converted. * @todo Implement support for bit fields with size bigger than 32 * @todo Implement support for varbit properly to remove leading zeroes @@ -113,10 +105,11 @@ int pg_fld2pg(struct pg_params* dst, int off, pg_type_t* types, * The function converts fields from PostgreSQL result (PGresult structure) * into the internal format used in SER. The function converts one row at a * time. - * @param fld The destination array of db_fld fields to be filled with converted + * @param dst The destination array of db_fld fields to be filled with converted * values. - * @param pres A PostgreSQL result structure to be converted into SER format. + * @param src A PostgreSQL result structure to be converted into SER format. * @param row Number of the row to be converted. + * @param types A type conversion table. * @param flags Connection flags controlling how values are converted. * @retval 0 on success * @retval A negative number on error. @@ -129,20 +122,24 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, pg_type_t* types, /** Checks if all db_fld fields have types compatible with corresponding field * types on the server. * The functions checks whether all db_fld fields in the last parameter are - * compatible with column types on the server. - * @param oids An array of Oids of corresponding columns on the server. - * @param lenghts An array of sizes of corresponding columns on the server. - * @param types An array used to map internal field types to Oids. + * compatible with column types on the server, for conversion to postgres format. * @param fld An array of db_fld fields to be checked. + * @param types An array used to map internal field types to Oids. * @retval 0 on success * @retval A negative number on error. */ int pg_check_fld2pg(db_fld_t* fld, pg_type_t* types); - +/** Checks if all db_fld fields have types compatible with corresponding field + * types on the server. + * The functions checks whether all db_fld fields in the last parameter are + * compatible with column types on the server, for conversion to interal DB format. + * @param fld An array of db_fld fields to be checked. + * @param types An array used to map internal field types to Oids. + * @retval 0 on success + * @retval A negative number on error. + */ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types); -/** @} */ - #endif /* _PG_FLD_H */

1 0

git:master: presence(k): fix doxygen errors, small extensions and cleanups in comments
by Henning Westerholt 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: 20ba5af96cc874cee9c68c2781cd46d0f0c1e3fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20ba5af… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Aug 8 22:18:28 2011 +0200 presence(k): fix doxygen errors, small extensions and cleanups in comments --- modules_k/presence/event_list.c | 10 +++------- modules_k/presence/event_list.h | 7 ++----- modules_k/presence/presence.c | 24 ++++++++++-------------- modules_k/presence/presence.h | 15 ++++++--------- modules_k/presence/presentity.c | 7 ++----- modules_k/presence/presentity.h | 8 ++------ modules_k/presence/publish.c | 7 ++----- modules_k/presence/publish.h | 8 ++------ modules_k/presence_mwi/presence_mwi.c | 7 +++++-- modules_k/presence_mwi/presence_mwi.h | 2 -- modules_k/presence_xml/add_events.c | 13 ++++--------- modules_k/presence_xml/add_events.h | 10 +++------- modules_k/presence_xml/presence_xml.c | 10 ++++------ modules_k/presence_xml/presence_xml.h | 4 ---- 14 files changed, 45 insertions(+), 87 deletions(-) diff --git a/modules_k/presence/event_list.c b/modules_k/presence/event_list.c index a8d3eac..0d628b6 100644 --- a/modules_k/presence/event_list.c +++ b/modules_k/presence/event_list.c @@ -1,8 +1,4 @@ /* - * $Id: presence.c 1953 2007-04-04 08:50:33Z anca_vamanu $ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,9 +22,9 @@ * 2007-04-04 initial version (anca) */ -/*! \file - * \brief Kamailio presence module - * \ref event_list.h +/*! + * \file + * \brief Kamailio presence module :: Events * \ingroup presence */ diff --git a/modules_k/presence/event_list.h b/modules_k/presence/event_list.h index 5082a73..23fdeba 100644 --- a/modules_k/presence/event_list.h +++ b/modules_k/presence/event_list.h @@ -1,8 +1,4 @@ /* - * $Id: event_list.h 1953 2007-04-04 08:50:33Z anca_vamanu $ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,7 +22,8 @@ * 2007-04-05 initial version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio presence module :: Events * \ingroup presence */ diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index e97df6c..d211b53 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -1,8 +1,4 @@ /* - * $Id$ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,18 +22,18 @@ * 2006-08-15 initial version (anca) */ -/*! \defgroup presence Presence :: A generic implementation of the SIP event package (PUBLISH, SUBSCRIBE, NOTIFY) - * - * The Kamailio presence module is a generic module for SIP event packages, which is much more than presence. - * It is extensible by developing other modules that use the internal developer API. - * Examples: - * - \ref presence_mwi - * - \ref presence_xml +/*! + * \defgroup presence Presence :: A generic implementation of the SIP event package (PUBLISH, SUBSCRIBE, NOTIFY) + * The Kamailio presence module is a generic module for SIP event packages, which is much more than presence. + * It is extensible by developing other modules that use the internal developer API. + * Examples: + *- \ref presence_mwi + *- \ref presence_xml */ -/*! \file - * \brief Kamailio presence module - * +/*! + * \file + * \brief Kamailio presence module :: Core * \ingroup presence */ diff --git a/modules_k/presence/presence.h b/modules_k/presence/presence.h index 7fb3271..88520f3 100644 --- a/modules_k/presence/presence.h +++ b/modules_k/presence/presence.h @@ -1,8 +1,4 @@ /* - * $Id - * - * presence - presence server implementation - * * Copyright (C) 2006 Voice Sistem SRL * * This file is part of Kamailio, a free SIP server. @@ -27,7 +23,8 @@ * 2006-10-09 first version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio presence module :: Core * \ingroup presence */ @@ -46,14 +43,14 @@ /* DB modes */ -/* subscriptions are held in memory and periodically updated to db, but retrieved from db only at startup */ +/** subscriptions are held in memory and periodically updated to db, but retrieved from db only at startup */ #define DB_MEMORY_ONLY 0 -/* same as memory_only, but if a subscription is not found, it falls back to db */ +/** same as memory_only, but if a subscription is not found, it falls back to db */ #define DB_FALLBACK 1 -/* subscriptions are held only in database */ +/** subscriptions are held only in database */ #define DB_ONLY 2 -/* TM bind */ +/** TM bind */ extern struct tm_binds tmb; extern sl_api_t slb; diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index 871850b..427a572 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -1,8 +1,4 @@ /* - * $Id$ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,7 +22,8 @@ * 2006-08-15 initial version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio presence module :: Presentity handling * \ingroup presence */ diff --git a/modules_k/presence/presentity.h b/modules_k/presence/presentity.h index 7253f83..2d5e9e5 100644 --- a/modules_k/presence/presentity.h +++ b/modules_k/presence/presentity.h @@ -1,8 +1,4 @@ /* - * $Id$ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,9 +22,9 @@ * 2006-08-15 initial version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio presence module :: Presentity handling - * \ref presentity.c * \ingroup presence */ diff --git a/modules_k/presence/publish.c b/modules_k/presence/publish.c index 839ed01..c2738bb 100644 --- a/modules_k/presence/publish.c +++ b/modules_k/presence/publish.c @@ -1,8 +1,4 @@ /* - * $Id$ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,7 +22,8 @@ * 2006-08-15 initial version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio presence module :: Support for PUBLISH handling * \ingroup presence */ diff --git a/modules_k/presence/publish.h b/modules_k/presence/publish.h index 95bdf84..5960e24 100644 --- a/modules_k/presence/publish.h +++ b/modules_k/presence/publish.h @@ -1,8 +1,4 @@ /* - * $Id$ - * - * presence module - presence server implementation - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,9 +22,9 @@ * 2006-08-15 initial version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio presence module :: PUBLISH support - * \ref publish.c * \ingroup presence */ diff --git a/modules_k/presence_mwi/presence_mwi.c b/modules_k/presence_mwi/presence_mwi.c index fc03c7f..1b2e8f3 100644 --- a/modules_k/presence_mwi/presence_mwi.c +++ b/modules_k/presence_mwi/presence_mwi.c @@ -1,6 +1,4 @@ /* - * presence_mwi module - Presence Handling of message-summary events - * * Copyright (C) 2007 Juha Heinanen * * This file is part of Kamailio, a free SIP server. @@ -24,6 +22,11 @@ * 2007-05-1 initial version (jih) */ + +/*! + * \defgroup presence_mwi Presence_mwi :: Presence Handling of message-summary events + */ + /*! * \file * \brief SIP-router Presence :: Message waiting indication diff --git a/modules_k/presence_mwi/presence_mwi.h b/modules_k/presence_mwi/presence_mwi.h index f77ab8b..6767dd1 100644 --- a/modules_k/presence_mwi/presence_mwi.h +++ b/modules_k/presence_mwi/presence_mwi.h @@ -1,6 +1,4 @@ /* - * presence_mwi module - presence_mwi header file - * * Copyright (C) 2007 Juha Heinanen * * This file is part of Kamailio, a free SIP server. diff --git a/modules_k/presence_xml/add_events.c b/modules_k/presence_xml/add_events.c index 21317cd..347cf24 100644 --- a/modules_k/presence_xml/add_events.c +++ b/modules_k/presence_xml/add_events.c @@ -1,8 +1,4 @@ /* - * $Id: add_events.c 2006-12-07 18:05:05Z anca_vamanu $ - * - * presence_xml module - - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,14 +22,13 @@ * 2007-04-17 initial version (anca) */ -/*! \file - * \brief Kamailio Presence_XML :: +/*! + * \file + * \brief Kamailio Presence_XML :: Several event packages, presence, presence.winfo, dialog;sla * \ingroup presence_xml */ -/* - * add 3 events: presence, presence.winfo, dialog;sla - * */ + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/modules_k/presence_xml/add_events.h b/modules_k/presence_xml/add_events.h index 4bce3af..3108302 100644 --- a/modules_k/presence_xml/add_events.h +++ b/modules_k/presence_xml/add_events.h @@ -1,8 +1,4 @@ /* - * $Id: add_events.h 2006-12-07 18:05:05Z anca_vamanu $ - * - * presence_xml module - - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,9 +22,9 @@ * 2007-04-18 initial version (anca) */ -/*! \file - * \brief Kamailio Presence_XML :: - * \ref add_events.c +/*! + * \file + * \brief Kamailio Presence_XML :: Several event packages, presence, presence.winfo, dialog;sla * \ingroup presence_xml */ diff --git a/modules_k/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c index e3bb8f2..2ab267b 100644 --- a/modules_k/presence_xml/presence_xml.c +++ b/modules_k/presence_xml/presence_xml.c @@ -1,8 +1,4 @@ /* - * $Id: presence_xml.c 2006-12-07 18:05:05Z anca_vamanu$ - * - * presence_xml module - Presence Handling XML bodies module - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server. @@ -26,12 +22,14 @@ * 2007-04-12 initial version (anca) */ -/*! \file +/*! + * \file * \brief Kamailio Presence_XML :: Core * \ingroup presence_xml */ -/*! \defgroup presence_xml Presence_xml :: This module implements a range of XML-based SIP event packages for presence +/*! + * \defgroup presence_xml Presence_xml :: This module implements a range of XML-based SIP event packages for presence */ diff --git a/modules_k/presence_xml/presence_xml.h b/modules_k/presence_xml/presence_xml.h index 4f0d007..8678bc3 100644 --- a/modules_k/presence_xml/presence_xml.h +++ b/modules_k/presence_xml/presence_xml.h @@ -1,8 +1,4 @@ /* - * $Id: presence_xml.h 2006-12-07 18:05:05Z anca_vamanu$ - * - * presence_xml module - Presence Handling XML bodies module - * * Copyright (C) 2006 Voice Sistem S.R.L. * * This file is part of Kamailio, a free SIP server.

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011