sr-dev November 2008

sr-dev@lists.kamailio.org

21 participants
83 discussions

git:andrei/fixups: fixups: support for PVE & PVS in get_*_fparam()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 39af8f24dab661a3d1a67098328234be0a755c67 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39af8f2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 02:34:09 2008 +0100 fixups: support for PVE & PVS in get_*_fparam() - get_str_fparam() and get_int_fparam() support now FPARAM_PVE & FPARAM_PVS --- sr_module.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 14 deletions(-) diff --git a/sr_module.c b/sr_module.c index 497f8b7..e35ee36 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1348,16 +1348,17 @@ int fixup_str_2(void** param, int param_no) } -/* - * Get the function parameter value as string - * Return values: 0 - Success - * -1 - Cannot get value +/** Get the function parameter value as string. + * @return 0 - Success + * -1 - Cannot get value */ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) { int_str val; int ret; avp_t* avp; + pv_value_t pv_val; + static char pve_buf[256]; /* ugly hack needed for PVE */ switch(param->type) { case FPARAM_REGEX: @@ -1374,12 +1375,12 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) case FPARAM_AVP: avp = search_first_avp(param->v.avp.flags, param->v.avp.name, &val, 0); - if (!avp) { + if (unlikely(!avp)) { DBG("Could not find AVP from function parameter '%s'\n", param->orig); return -1; } - if (avp->flags & AVP_VAL_STR) { + if (likely(avp->flags & AVP_VAL_STR)) { *dst = val.s; } else { /* The caller does not know of what type the AVP will be so @@ -1390,17 +1391,34 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) break; case FPARAM_SELECT: ret = run_select(dst, param->v.select, msg); - if (ret < 0 || ret > 0) return -1; + if (unlikely(ret < 0 || ret > 0)) return -1; + break; + case FPARAM_PVS: + if (likely((pv_get_spec_value(msg, param->v.pvs, &pv_val)==0) && + ((pv_val.flags&(PV_VAL_NULL|PV_VAL_STR))==PV_VAL_STR))){ + *dst=pv_val.rs; + }else{ + ERR("Could not convert PV to str\n"); + return -1; + } + break; + case FPARAM_PVE: + dst->len=sizeof(pve_buf); + if (unlikely(pv_printf(msg, param->v.pve, pve_buf, &dst->len)!=0)){ + ERR("Could not convert the PV-formated string to str\n"); + dst->len=0; + return -1; + }; + dst->s=pve_buf; break; } return 0; } -/* - * Get the function parameter value as integer - * Return values: 0 - Success - * -1 - Cannot get value +/** Get the function parameter value as integer. + * @return 0 - Success + * -1 - Cannot get value */ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) { @@ -1408,6 +1426,7 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) int ret; avp_t* avp; str tmp; + pv_value_t pv_val; switch(param->type) { case FPARAM_INT: @@ -1421,7 +1440,7 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) case FPARAM_AVP: avp = search_first_avp(param->v.avp.flags, param->v.avp.name, &val, 0); - if (!avp) { + if (unlikely(!avp)) { DBG("Could not find AVP from function parameter '%s'\n", param->orig); return -1; @@ -1437,12 +1456,23 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) break; case FPARAM_SELECT: ret = run_select(&tmp, param->v.select, msg); - if (ret < 0 || ret > 0) return -1; - if (str2int(&tmp, (unsigned int*)dst) < 0) { + if (unlikely(ret < 0 || ret > 0)) return -1; + if (unlikely(str2int(&tmp, (unsigned int*)dst) < 0)) { ERR("Could not convert select result to int\n"); return -1; } break; + case FPARAM_PVS: + if (likely((pv_get_spec_value(msg, param->v.pvs, &pv_val)==0) && + ((pv_val.flags&(PV_VAL_NULL|PV_VAL_INT))==PV_VAL_INT))){ + *dst=pv_val.ri; + }else{ + ERR("Could not convert PV to int\n"); + return -1; + } + break; + case FPARAM_PVE: + return -1; } return 0; }

15 years, 12 months

git:andrei/fixups: fixups: added kamailio compatible fixups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 51d1766090690b7a82e1ff45d77e57de5a76523c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51d1766… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 02:46:50 2008 +0100 fixups: added kamailio compatible fixups - added kamailio compatible fixups (e.g. fixup_str_str), which use ser fix_param() underneath - added kamailio compatible macros for gparam_t (which is now fparam_t) and fixup_get_[si]value() (to get_{int,str}_value) --- mod_fix.c | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ mod_fix.h | 123 ++++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=51d…

15 years, 12 months

git:andrei/fixups: fixups: fix param function using a param type mask

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: bf9d1c43796843bb25f33ab68d219806c5286506 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf9d1c4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:47:23 2008 +0100 fixups: fix param function using a param type mask - added generic fix_param_type(types_mask, param) function which will try all the types specified in the mask in sequence, until if manages to convert the param to the corresponding type, or it finishes iterating through the types. (e.g. fix_param_types(FPARAM_AVP|FPARAM_SELECT|FPARAM_STR, param)) - changed FPARAM_* order such that more generic types are at the end (types having less chance of failing a conversion, like FPARAM_STR) --- sr_module.c | 22 ++++++++++++++++++++++ sr_module.h | 29 ++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/sr_module.c b/sr_module.c index 114f0d2..497f8b7 100644 --- a/sr_module.c +++ b/sr_module.c @@ -38,6 +38,7 @@ * 2006-02-07 added fix_flag (andrei) * 2008-02-29 store all the reponse callbacks in their own array (andrei) * 2008-11-17 support dual module interface: ser & kamailio (andrei) + * 2008-11-26 added fparam_free_contents() and fix_param_types (andrei) */ @@ -1174,6 +1175,27 @@ void fparam_free_contents(fparam_t* fp) } + +/** fix a param to one of the given types (mask). + * + * @param types - bitmap of the allowed types (e.g. FPARAM_INT|FPARAM_STR) + * @param param - value/result + * @return - 0 on success, -1 on error, 1 if param doesn't + * match any of the types + */ +int fix_param_types(int types, void** param) +{ + int ret; + int t; + + for (t=types & ~(types-1); types; types&=(types-1), t=types & ~(types-1)){ + if ((ret=fix_param(t, param))<=0) return ret; + } + return E_UNSPEC; +} + + + /* * Fixup variable string, the parameter can be * AVP, SELECT, or ordinary string. AVP and select diff --git a/sr_module.h b/sr_module.h index 1af0ea4..149ca6e 100644 --- a/sr_module.h +++ b/sr_module.h @@ -46,6 +46,7 @@ * dual module interface support: ser & kamailio (andrei) * 2008-11-18 prototypes for various fixed parameters numbers module * functions (3, 4, 5 & 6) and variable parameters (andrei) + * 2008-11-26 added fparam_free_contents() and fix_param_types (andrei) */ /*! @@ -234,17 +235,23 @@ struct param_export_ { }; + +/** allowed parameter types. + * the types that cannot be deduced from the string, should + * be at the end (e.g. FPARAM_STR), to allow fallback + * (e.g. fix_param_types(FPARAM_AVP|FPARAM_SELECT|FPARAM_STR, param)) + */ enum { FPARAM_UNSPEC = 0, - FPARAM_STRING = (1 << 0), - FPARAM_STR = (1 << 1), - FPARAM_INT = (1 << 2), - FPARAM_REGEX = (1 << 3), - FPARAM_AVP = (1 << 5), - FPARAM_SELECT = (1 << 6), - FPARAM_SUBST = (1 << 7), - FPARAM_PVS = (1 << 8), - FPARAM_PVE = (1 << 9) + FPARAM_INT = (1 << 0), + FPARAM_REGEX = (1 << 1), + FPARAM_AVP = (1 << 2), + FPARAM_SELECT = (1 << 3), + FPARAM_SUBST = (1 << 4), + FPARAM_PVS = (1 << 5), + FPARAM_PVE = (1 << 6), + FPARAM_STRING = (1 << 7), + FPARAM_STR = (1 << 8) }; /* @@ -419,6 +426,10 @@ int fix_flag( modparam_t type, void* val, int fix_param(int type, void** param); void fparam_free_contents(fparam_t* fp); +/** fix a param to one of the given types (mask). + */ +int fix_param_types(int types, void** param); + /* * Fixup variable string, the parameter can be * AVP, SELECT, or ordinary string. AVP and select

15 years, 12 months

git:andrei/fixups: fixups: generic fixups work now on kamailio pvars

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: ad4f08c9cf437d8280c07f3673cb050dc3fd714a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad4f08c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:30:26 2008 +0100 fixups: generic fixups work now on kamailio pvars - fix_param() supports now FPARAM_PVS and FPARAM_PVE (kamailio GPARAM_TYPE_PVS and GPARAM_TYPE_PVE) - added fparam_free_contents() which frees the contents of a fparam_t --- sr_module.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- sr_module.h | 5 ++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/sr_module.c b/sr_module.c index 919bde5..114f0d2 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1031,6 +1031,7 @@ int fix_param(int type, void** param) if (regcomp(p->v.regex, *param, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { pkg_free(p->v.regex); + p->v.regex=0; ERR("Bad regular expression '%s'\n", (char*)*param); goto error; } @@ -1058,7 +1059,7 @@ int fix_param(int type, void** param) if (!name.len || name.s[0] != '@') { /* Not a select identifier */ pkg_free(p); - return 1; + return 1; } if (parse_select(&name.s, &p->v.select) < 0) { ERR("Error while parsing select identifier\n"); @@ -1071,7 +1072,37 @@ int fix_param(int type, void** param) p->v.subst = subst_parser(&s); if (!p->v.subst) { ERR("Error while parsing regex substitution\n"); - goto error; + goto error; + } + break; + case FPARAM_PVS: + name.s = (char*)*param; + name.len = strlen(name.s); + trim(&name); + if (!name.len || name.s[0] != '$'){ + /* not a pvs identifier */ + pkg_free(p); + return 1; + } + p->v.pvs=pkg_malloc(sizeof(pv_spec_t)); + if (p->v.pvs==0){ + ERR("out of memory while parsing pv_spec_t\n"); + goto error; + } + if (pv_parse_spec(&name, p->v.pvs)==0){ + ERR("unsupported user field indentifier \"%.*s\"\n", + name.len, name.s); + pkg_free(p->v.pvs); + p->v.pvs=0; + goto error; + } + break; + case FPARAM_PVE: + name.s = (char*)*param; + name.len = strlen(name.s); + if (pv_parse_format(&name, &p->v.pve)<0){ + ERR("bad PVE format: \"%.*s\"\n", name.len, name.s); + goto error; } break; } @@ -1086,6 +1117,63 @@ error: } + +/** fparam_t free function. + * Frees the "content" of a fparam, but not the fparam itself. + * Assumes pkg_malloc'ed content. + * @param fp - fparam to be freed + * + */ +void fparam_free_contents(fparam_t* fp) +{ + + if (fp==0) + return; + switch(fp->type) { + case FPARAM_UNSPEC: + case FPARAM_STRING: /* asciiz string, not str */ + case FPARAM_INT: + case FPARAM_STR: + /* nothing to do */ + return; + case FPARAM_REGEX: + if (fp->v.regex){ + regfree(fp->v.regex); + pkg_free(fp->v.regex); + fp->v.regex=0; + } + break; + case FPARAM_AVP: + free_avp_name(&fp->v.avp.flags, &fp->v.avp.name); + break; + case FPARAM_SELECT: + if (fp->v.select){ + free_select(fp->v.select); + fp->v.select=0; + } + break; + case FPARAM_SUBST: + if (fp->v.subst){ + subst_expr_free(fp->v.subst); + fp->v.subst=0; + } + break; + case FPARAM_PVS: + if (fp->v.pvs){ + pv_spec_free(fp->v.pvs); + fp->v.pvs=0; + } + break; + case FPARAM_PVE: + if (fp->v.pve){ + pv_elem_free_all(fp->v.pve); + fp->v.pve=0; + } + break; + } +} + + /* * Fixup variable string, the parameter can be * AVP, SELECT, or ordinary string. AVP and select diff --git a/sr_module.h b/sr_module.h index 69d476f..1af0ea4 100644 --- a/sr_module.h +++ b/sr_module.h @@ -261,8 +261,8 @@ typedef struct fparam { avp_ident_t avp; /* AVP identifier */ select_t* select; /* select structure */ struct subst_expr* subst; /* Regex substitution */ - struct pv_spec_t* pvs; /* kamailo pseudo-vars */ - struct pv_elem_t* pve; /* kamailo pseudo-vars */ + pv_spec_t* pvs; /* kamailo pseudo-vars */ + pv_elem_t* pve; /* kamailo pseudo-vars in a string */ } v; } fparam_t; @@ -417,6 +417,7 @@ int fix_flag( modparam_t type, void* val, * parameter types */ int fix_param(int type, void** param); +void fparam_free_contents(fparam_t* fp); /* * Fixup variable string, the parameter can be

15 years, 12 months

git:andrei/fixups: avp: minor fixes & comments

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: 36fe005907cf7e27b0014f0a50d9ae3095174bbb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36fe005… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:20:52 2008 +0100 avp: minor fixes & comments - free_avp_name() for a regexp avp did not use regfree(...) - changed free_avp_name() prototype to use avp_flags_t for the type - added comments for parse_avp_ident() --- usr_avp.c | 41 +++++++++++++++++++++++++++++++++++++++-- usr_avp.h | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index e70479c..eea9894 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -838,6 +838,39 @@ int parse_avp_name( str *name, int *type, int_str *avp_name, int *index) return ret; } + +/** parse an avp indentifier. + * + * Parses the following avp indentifier forms: + * - "i:<number>" - old form, deprecated (e.g. i:42) + * - "s:<string>" - old form, deprecated (e.g. s:foo) + * - "<track>.<name>" (e.g.: f.bar) + * - "<track>.<name>[<index>]" (e.g.: f.bar[1]) + * - "<track><class>.<name>" (e.g: tu.bar) + * - "<track><class>.<name>[<index>]" (e.g: fd.bar[2]) + * - "<string>" (e.g.: foo) + * Where: + * <string> = ascii string + * <id> = ascii string w/o '[', ']', '.' and '/' + * <name> = <id> | '/' regex '/' + * (Note: regex use is deprecated) + * <track> = 'f' | 't' | 'g' + * (from, to or global) + * <class> = 'r' | 'u' | 'd' + * (uri, user or domain) + * <index> = <number> | '-' <number> | '' + * (the avp index, if missing it means AVP_INDEX_ALL, but + * it's use is deprecated) + * More examples: + * "fr.bar[1]" - from track, uri class, avp "bar", the value 1. + * "tu./^foo/" - to track, user class, all avps for which the name + * starts with foo (note RE in avp names are deprecated). + * "t.did" - to track, "did" avp + * + * @param name - avp identifier + * @param *attr - the result will be stored here + * @return 0 on success, -1 on error + */ int parse_avp_ident( str *name, avp_ident_t* attr) { unsigned int id; @@ -967,6 +1000,7 @@ int parse_avp_ident( str *name, avp_ident_t* attr) name->s[name->len-1]=0; if (regcomp(attr->name.re, name->s+1, REG_EXTENDED|REG_NOSUB|REG_ICASE)) { pkg_free(attr->name.re); + attr->name.re=0; name->s[name->len-1] = '/'; goto error; } @@ -1010,10 +1044,13 @@ int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index) } } -void free_avp_name( int *type, int_str *avp_name) +void free_avp_name(avp_flags_t *type, int_str *avp_name) { - if ((*type & AVP_NAME_RE) && (avp_name->re)) + if ((*type & AVP_NAME_RE) && (avp_name->re)){ + regfree(avp_name->re); pkg_free(avp_name->re); + avp_name->re=0; + } } int add_avp_galias_str(char *alias_definition) diff --git a/usr_avp.h b/usr_avp.h index 2b68107..49741cc 100644 --- a/usr_avp.h +++ b/usr_avp.h @@ -197,7 +197,7 @@ int add_avp_galias(str *alias, int type, int_str avp_name); int parse_avp_ident( str *name, avp_ident_t* attr); int parse_avp_name( str *name, int *type, int_str *avp_name, int *index); int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index); -void free_avp_name( int *type, int_str *avp_name); +void free_avp_name( avp_flags_t *type, int_str *avp_name); /* AVP flags functions */ #define MAX_AVPFLAG ((unsigned int)( sizeof(avp_flags_t) * CHAR_BIT - 1 - AVP_CUSTOM_FLAGS))

15 years, 12 months

git:andrei/fixups: select: comments for parse_select()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: d22deb6cfa05e86749ceead50c9944e08232b659 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d22deb6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Nov 27 01:25:42 2008 +0100 select: comments for parse_select() --- select.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/select.c b/select.c index 9cbe16a..13c6dc7 100644 --- a/select.c +++ b/select.c @@ -60,11 +60,30 @@ static select_table_t *select_list = &select_core_table; */ int select_level = 0; -/* +/** parse a select identifier (internal version) * Parse select string into select structure s - * moves pointer p to the first unused char + * moves pointer p to the first unused char. + * + * The select identifier must be of the form: + * [@] <sel_id> [ '.' <sel_id> ...] + * + * Where + * <sel_id> = <id> | + * <id> '[' <idx> ']' + * <id> = [a-zA-Z0-9_]+ + * <idx> = <number> | <string> + * <string> = '"' <ascii> '"' | + * '\"' <ascii> '\"' + * + * Examples: + * @to.tag + * @hf_value["contact"] + * @msg.header["SER-Server-ID"] + * @eval.pop[-1] + * contact.uri.params.maddr + * cfg_get.rtp_proxy.enabled * - * Returns -1 error + * @return -1 error * p points to the first unconsumed char * 0 success * p points to the first unconsumed char @@ -148,6 +167,35 @@ error: return -1; } + +/** parse a select identifier. + * Parse select string into select structure s and + * moves pointer p to the first unused char. + * + * The select identifier must be of the form: + * [@] <sel_id> [ '.' <sel_id> ...] + * + * Where + * <sel_id> = <id> | + * <id> '[' <idx> ']' + * <id> = [a-zA-Z0-9_]+ + * <idx> = <number> | '-' <number> | <string> + * <string> = '"' <ascii> '"' | + * '\"' <ascii> '\"' + * + * Examples: + * @to.tag + * @hf_value["contact"] + * @msg.header["SER-Server-ID"] + * @eval.pop[-1] + * contact.uri.params.maddr + * cfg_get.rtp_proxy.enabled + * + * @param p - double string (asciiz) pointer, *p is moved to the first char + * after the select identifier + * @param s - the result will be stored here + * @return < 0 on error, 0 on success + */ int parse_select (char** p, select_t** s) { select_t* sel;

15 years, 12 months

git:andrei/fixups: sr_module: identing and whitespace

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/fixups Commit: f2f129666e3dc52d91a5835cca58c5e8f80e5b43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2f1296… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 25 12:33:28 2008 +0100 sr_module: identing and whitespace - fixed the particularly bad mixed space/tab identing and longer lines --- sr_module.c | 461 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 226 insertions(+), 235 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f2f…

15 years, 12 months

git:master: Merge ssh://git.sip-router.org/sip-router into my_branch

by Henning Westerholt

Module: sip-router Branch: master Commit: 8d41196809f014e00346785b6517bd2c4051901a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d41196… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 24 19:13:59 2008 +0100 Merge ssh://git.sip-router.org/sip-router into my_branch ---

15 years, 12 months

git:ser_core_cvs: dns: fixed missing sctp SRV queries

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 887ca9955a33b892e89f6bf0f97be5971da814e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=887ca99… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 25 19:15:05 2008 +0000 dns: fixed missing sctp SRV queries - support for sctp SRV queries was missing --- config.h | 3 +++ resolve.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/config.h b/config.h index 4fec2d9..393d1f3 100644 --- a/config.h +++ b/config.h @@ -126,6 +126,9 @@ #define SRV_TLS_PREFIX "_sips._tcp." #define SRV_TLS_PREFIX_LEN (sizeof(SRV_TLS_PREFIX) - 1) +#define SRV_SCTP_PREFIX "_sip._sctp." +#define SRV_SCTP_PREFIX_LEN (sizeof(SRV_SCTP_PREFIX) - 1) + #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN /*used only if PKG_MALLOC is defined*/ diff --git a/resolve.c b/resolve.c index e492244..94e0558 100644 --- a/resolve.c +++ b/resolve.c @@ -1019,6 +1019,11 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, memcpy(tmp+SRV_TLS_PREFIX_LEN, name->s, name->len); tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0'; break; + case PROTO_SCTP: + memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN); + memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len); + tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0'; + break; default: LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n", srv_proto);

15 years, 12 months

master branch reverted 2 commits back

by Andrei Pelinescu-Onciul

I've reverted the master branch back 2 commits back to: 7e69be0441a98653ea0d94c831f64a2947aa4fff (the current master head). If you did git fetch origin or git pull origin master yesterday or today you need to make sure your local repo mirrors the undo on master: git fetch origin If you have a local branch tracking master, on which you haven't done _any_ changes, use: git checkout my_master # example name git reset --hard origin/master # WARNING: you will loose all local # changes! If you did merge (git merge or git pull) master during these 2 days into one of your branches and you did some commit afterwards, backup (e.g. git branch my_branch my_branch_backup) and then try: git checkout my_branch git rebase --onto 7e69be0441a98653ea0d94c831f64a2947aa4fff 8d41196809f014e00346785b6517bd2c4051901a WARNING1: do it only if you have the offending commits in your branch. You can check using: git rev-list my_branch |grep 7e69be0441a98653ea0d94c831f64a2947aa4fff git rev-list my_branch |grep 8d41196809f014e00346785b6517bd2c4051901a WARNING2: look at the log and maybe run gitk. If it doesn't look ok you can revert: git reset --hard ORIG_HEAD If you have local uncommitted changes, either commit them before, or use git stash. Andrei

15 years, 12 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2008