sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:46f0f1c0: auth_identity: switched to use pointer of X509_STORE_CTX

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 46f0f1c0f492c45c1b1bbcfd4a0cc63eb56480ea URL: https://github.com/kamailio/kamailio/commit/46f0f1c0f492c45c1b1bbcfd4a0cc63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T16:32:43+02:00 auth_identity: switched to use pointer of X509_STORE_CTX - starting with libssl 1.1.0 the size of X509_STORE_CTX is not known at compile time, throwing error: error: storage size of 'ca_ctx' isn't known X509_STORE_CTX ca_ctx; - reported by Victor Seva, GH #685 --- Modified: modules/auth_identity/auth_crypt.c --- Diff: https://github.com/kamailio/kamailio/commit/46f0f1c0f492c45c1b1bbcfd4a0cc63… Patch: https://github.com/kamailio/kamailio/commit/46f0f1c0f492c45c1b1bbcfd4a0cc63… --- diff --git a/modules/auth_identity/auth_crypt.c b/modules/auth_identity/auth_crypt.c index 2aa6a0a..c6a0fd1 100644 --- a/modules/auth_identity/auth_crypt.c +++ b/modules/auth_identity/auth_crypt.c @@ -35,6 +35,7 @@ #include <openssl/sha.h> #include <openssl/x509.h> #include <openssl/x509v3.h> +#include <openssl/crypto.h> #include <openssl/x509_vfy.h> #include "../../mem/mem.h" @@ -113,7 +114,7 @@ int check_x509_subj(X509 *pcert, str* sdom) if (actname->type == GEN_DNS || actname->type == GEN_URI) { /* we've found one */ - altptr = (char *)ASN1_STRING_data(actname->d.ia5); + altptr = (char *)ASN1_STRING_get0_data(actname->d.ia5); if (actname->type == GEN_URI) { if (parse_uri(altptr, strlen(altptr), &suri) != 0) { continue; @@ -161,22 +162,30 @@ int check_x509_subj(X509 *pcert, str* sdom) int verify_x509(X509 *pcert, X509_STORE *pcacerts) { - X509_STORE_CTX ca_ctx; + X509_STORE_CTX *ca_ctx = NULL; char *strerr; + ca_ctx = X509_STORE_CTX_new(); + if(ca_ctx==NULL) { + LM_ERR("cannot get a x509 context\n"); + return -1; + } - if (X509_STORE_CTX_init(&ca_ctx, pcacerts, pcert, NULL) != 1) { + if (X509_STORE_CTX_init(ca_ctx, pcacerts, pcert, NULL) != 1) { LOG(L_ERR, "AUTH_IDENTITY:verify_x509: Unable to init X509 store ctx\n"); + X509_STORE_CTX_free(ca_ctx); return -1; } - if (X509_verify_cert(&ca_ctx) != 1) { - strerr = (char *) X509_verify_cert_error_string(ca_ctx.error); + if (X509_verify_cert(ca_ctx) != 1) { + strerr = (char *)X509_verify_cert_error_string(X509_STORE_CTX_get_error(ca_ctx)); LOG(L_ERR, "AUTH_IDENTITY VERIFIER: Certificate verification error: %s\n", strerr); - X509_STORE_CTX_cleanup(&ca_ctx); + X509_STORE_CTX_cleanup(ca_ctx); + X509_STORE_CTX_free(ca_ctx); return -2; } - X509_STORE_CTX_cleanup(&ca_ctx); + X509_STORE_CTX_cleanup(ca_ctx); + X509_STORE_CTX_free(ca_ctx); LOG(AUTH_DBG_LEVEL, "AUTH_IDENTITY VERIFIER: Certificate is valid\n");

7 years, 11 months

git:master:e5532f05: auth_identity: fix misleading indentation level

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e5532f05d7b2b6b8d90d01fd9e934a412c7168e0 URL: https://github.com/kamailio/kamailio/commit/e5532f05d7b2b6b8d90d01fd9e934a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T16:26:43+02:00 auth_identity: fix misleading indentation level --- Modified: modules/auth_identity/auth_hdrs.c --- Diff: https://github.com/kamailio/kamailio/commit/e5532f05d7b2b6b8d90d01fd9e934a4… Patch: https://github.com/kamailio/kamailio/commit/e5532f05d7b2b6b8d90d01fd9e934a4… --- diff --git a/modules/auth_identity/auth_hdrs.c b/modules/auth_identity/auth_hdrs.c index aa012d6..708366b 100644 --- a/modules/auth_identity/auth_hdrs.c +++ b/modules/auth_identity/auth_hdrs.c @@ -448,7 +448,7 @@ int digeststr_asm(dynstr *sout, struct sip_msg *msg, str *sdate, int iflags) /* there was an error or the required header is missing */ if (iRes==AUTH_ERROR - || (iRes==AUTH_NOTFOUND && (pactpart[i1].iflag & DS_REQUIRED))) + || (iRes==AUTH_NOTFOUND && (pactpart[i1].iflag & DS_REQUIRED))) return -1; switch (pactpart[i1].itype) { @@ -568,10 +568,12 @@ int append_date(str *sdate, int idatesize, time_t *tout, struct sip_msg *msg) if (sdate && idatesize >= ilen) { memcpy(sdate->s, date_str, ilen); sdate->len=ilen; - } else + } else { return -5; - if (tout) - *tout=tdate_now; + } + + if (tout) + *tout=tdate_now; return 0; } @@ -666,24 +668,24 @@ static char *auth_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) goto other; } else { return (p + 1); - } + } /* Unknown header type */ other: p = q_memchr(p, ':', end - p); - if (!p) { /* No double colon found, error.. */ + if (!p) { /* No double colon found, error.. */ *type = HDR_ERROR_T; return 0; - } else { + } else { *type = HDR_OTHER_T; return (p + 1); - } + } return p; } /* parses buffer that contains a SIP message header, looks for "Contact" - header field and returns the value of that */ + * header field and returns the value of that */ static int get_contact_body(char *buf, unsigned int len, str *sout) { char *end, *s, *tmp, *match;

7 years, 11 months

git:master:d7b0c68b: core: parser - removed level and function prefix from log messages for identity info

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7b0c68b825222f139aaa16a73de23fe2c07312a URL: https://github.com/kamailio/kamailio/commit/d7b0c68b825222f139aaa16a73de23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T15:35:04+02:00 core: parser - removed level and function prefix from log messages for identity info --- Modified: parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/d7b0c68b825222f139aaa16a73de23f… Patch: https://github.com/kamailio/kamailio/commit/d7b0c68b825222f139aaa16a73de23f… --- diff --git a/parser/parse_identityinfo.c b/parser/parse_identityinfo.c index f8ec22d..32f95da 100644 --- a/parser/parse_identityinfo.c +++ b/parser/parse_identityinfo.c @@ -53,14 +53,15 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) status=II_URI_BEGIN; mainstatus = II_M_URI_BEGIN; ii_b->uri.s = p + 1; - } else + } else { goto parseerror; - break; + } + break; case 'h': case 'H': /* "http://" or "https://" part */ switch (status) { case II_URI_BEGIN: - if (end - p <= 8 || strncasecmp(p,"http",strlen("http"))) + if (end - p <= 8 || strncasecmp(p, "http", 4)) goto parseerror; p+=4; if (*p == 's' || *p == 'S') p++; @@ -168,7 +169,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) p=eat_lws_end(p, end); /*check if the header ends here*/ if (p>=end) { - LOG(L_ERR, "ERROR: parse_identityinfo: strange EoHF\n"); + LM_ERR("strange EoHF\n"); goto parseerror; } ii_b->error=PARSE_OK; @@ -201,7 +202,8 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) if (mainstatus == II_M_SEMIC) { mainstatus = II_M_TAG; status = II_TAG; - if (end - p <= 3 || strncasecmp(p,"alg",strlen("alg"))) + if (end - p <= 3 + || strncasecmp(p,"alg",strlen("alg"))) goto parseerror; p+=2; } else @@ -293,9 +295,9 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) case II_URI_IPV4: case II_URI_IPV6: if (isalnum(*p) - || *p == '-' - || *p == '.' - || *p == ':' ) + || *p == '-' + || *p == '.' + || *p == ':' ) break; case II_START: goto parseerror; @@ -308,9 +310,8 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) return ; parseerror: - LOG( L_ERR , "ERROR: parse_identityinfo: " - "unexpected char [%c] in status %d: <<%.*s>> .\n", - *p,status, (int)(p-buffer), ZSW(p)); + LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", + *p,status, (int)(p-buffer), ZSW(p)); return ; } @@ -320,9 +321,9 @@ int parse_identityinfo_header(struct sip_msg *msg) if ( !msg->identity_info - && (parse_headers(msg,HDR_IDENTITY_INFO_F,0)==-1 - || !msg->identity_info) ) { - LOG(L_ERR,"ERROR:parse_identityinfo_header: bad msg or missing IDENTITY-INFO header\n"); + && (parse_headers(msg,HDR_IDENTITY_INFO_F,0)==-1 + || !msg->identity_info) ) { + LM_ERR("bad msg or missing IDENTITY-INFO header\n"); goto error; } @@ -338,8 +339,8 @@ int parse_identityinfo_header(struct sip_msg *msg) memset(identityinfo_b, 0, sizeof(*identityinfo_b)); parse_identityinfo(msg->identity_info->body.s, - msg->identity_info->body.s + msg->identity_info->body.len+1, - identityinfo_b); + msg->identity_info->body.s + msg->identity_info->body.len+1, + identityinfo_b); if (identityinfo_b->error==PARSE_ERROR){ free_identityinfo(identityinfo_b); goto error;

7 years, 11 months

git:master:b7aa4b2c: core: ut - fix misleading indentation for IF blocks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7aa4b2cac495397f36fecb2e5bd5a0b80844346 URL: https://github.com/kamailio/kamailio/commit/b7aa4b2cac495397f36fecb2e5bd5a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T15:30:13+02:00 core: ut - fix misleading indentation for IF blocks - reported by latest gcc on debian sid --- Modified: ut.c --- Diff: https://github.com/kamailio/kamailio/commit/b7aa4b2cac495397f36fecb2e5bd5a0… Patch: https://github.com/kamailio/kamailio/commit/b7aa4b2cac495397f36fecb2e5bd5a0… --- diff --git a/ut.c b/ut.c index 71907b4..9856b72 100644 --- a/ut.c +++ b/ut.c @@ -47,7 +47,7 @@ int user2uid(int* uid, int* gid, char* user) { char* tmp; struct passwd *pw_entry; - + if (user){ *uid=strtol(user, &tmp, 10); if ((tmp==0) ||(*tmp)){ @@ -73,7 +73,7 @@ int group2gid(int* gid, char* group) { char* tmp; struct group *gr_entry; - + if (group){ *gid=strtol(group, &tmp, 10); if ((tmp==0) ||(*tmp)){ @@ -93,7 +93,7 @@ int group2gid(int* gid, char* group) /* * Replacement of timegm (does not exists on all platforms - * Taken from + * Taken from * http://lists.samba.org/archive/samba-technical/2002-November/025737.html */ time_t _timegm(struct tm* t) @@ -111,7 +111,7 @@ time_t _timegm(struct tm* t) } tl += 3600; } - + tg = gmtime(&tl); tg->tm_isdst = 0; tb = mktime(tg); @@ -173,7 +173,7 @@ char* as_asciiz(str* s) /* return system version (major.minor.minor2) as * (major<<16)|(minor)<<8|(minor2) * (if some of them are missing, they are set to 0) - * if the parameters are not null they are set to the coresp. part + * if the parameters are not null they are set to the coresp. part */ unsigned int get_sys_version(int* major, int* minor, int* minor2) { @@ -182,7 +182,7 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2) int m2; int m3; char* p; - + memset (&un, 0, sizeof(un)); m1=m2=m3=0; /* get sys version */ @@ -218,24 +218,24 @@ char* get_abs_pathname(str* base, str* file) str ser_cfg; char* buf, *dir, *res; int len; - + if (base == NULL) { ser_cfg.s = cfg_file; ser_cfg.len = strlen(cfg_file); base = &ser_cfg; } - + if (!base->s || base->len <= 0 || base->s[0] != '/') { BUG("get_abs_pathname: Base file must be absolute pathname: " "'%.*s'\n", STR_FMT(base)); return NULL; } - + if (!file || !file->s || file->len <= 0) { BUG("get_abs_pathname: Invalid 'file' parameter\n"); return NULL; } - + if (file->s[0] == '/') { /* This is an absolute pathname, make a zero terminated * copy and use it as it is */ @@ -257,7 +257,7 @@ char* get_abs_pathname(str* base, str* file) memcpy(buf, base->s, base->len); buf[base->len]=0; dir = dirname(buf); - + len = strlen(dir); if ((res = pkg_malloc(len + 1 + file->len + 1)) == NULL) { ERR("get_abs_pathname: No memory left (pkg_malloc failed)\n"); @@ -321,7 +321,7 @@ void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) if (memcmp(sp, pp, len2) == 0) return sp; - sp++; + sp++; } return NULL; @@ -352,7 +352,7 @@ void * ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) if (memcmp(sp, pp, len2) == 0) return sp; - sp--; + sp--; } return NULL;

7 years, 11 months

git:master:a4b43f96: core: proper code block when saving chosen naptr record

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a4b43f962a4493defb3fd608d1d2fad3ee58794a URL: https://github.com/kamailio/kamailio/commit/a4b43f962a4493defb3fd608d1d2fad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T15:26:39+02:00 core: proper code block when saving chosen naptr record --- Modified: resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/a4b43f962a4493defb3fd608d1d2fad… Patch: https://github.com/kamailio/kamailio/commit/a4b43f962a4493defb3fd608d1d2fad… --- diff --git a/resolve.c b/resolve.c index 0af1be3..3d57418 100644 --- a/resolve.c +++ b/resolve.c @@ -1335,7 +1335,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, -#ifdef USE_NAPTR +#ifdef USE_NAPTR /** iterates over a naptr rr list, returning each time a "good" naptr record @@ -1343,7 +1343,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, * params: * naptr_head - naptr rr list head * tried - bitmap used to keep track of the already tried records - * (no more then sizeof(tried)*8 valid records are + * (no more then sizeof(tried)*8 valid records are * ever walked * srv_name - if succesfull, it will be set to the selected record * srv name (naptr repl.) @@ -1351,10 +1351,10 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, * protocol * returns 0 if no more records found or a pointer to the selected record * and sets protocol and srv_name - * WARNING: when calling first time make sure you run first + * WARNING: when calling first time make sure you run first * naptr_iterate_init(&tried) */ -struct rdata* naptr_sip_iterate(struct rdata* naptr_head, +struct rdata* naptr_sip_iterate(struct rdata* naptr_head, naptr_bmp_t* tried, str* srv_name, char* proto) { @@ -1373,7 +1373,7 @@ struct rdata* naptr_sip_iterate(struct rdata* naptr_head, saved_proto=0; i=0; for(l=naptr_head; l && (i<MAX_NAPTR_RRS); l=l->next){ - if (l->type!=T_NAPTR) continue; + if (l->type!=T_NAPTR) continue; naptr=(struct naptr_rdata*) l->rdata; if (naptr==0){ LM_CRIT("null rdata\n"); @@ -1391,17 +1391,18 @@ struct rdata* naptr_sip_iterate(struct rdata* naptr_head, #endif if ((naptr_proto_supported(naptr_proto))){ if (naptr_choose(&naptr_saved, &saved_proto, - naptr, naptr_proto)) + naptr, naptr_proto)) { idx=i; l_saved=l; } + } i++; } if (naptr_saved){ /* found something */ #ifdef NAPTR_DBG LM_DBG("choosed NAPTR rr %.*s, proto %d tried: 0x%x\n", - naptr_saved->repl_len, + naptr_saved->repl_len, naptr_saved->repl, (int)saved_proto, *tried); #endif *tried|=1<<idx;

7 years, 11 months

git:master:fc65a118: core: fixed misleading indentation for return statement

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fc65a118d15e7942adccd332996701cdb6f1b0c7 URL: https://github.com/kamailio/kamailio/commit/fc65a118d15e7942adccd332996701c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T15:19:37+02:00 core: fixed misleading indentation for return statement --- Modified: tls_hooks.c --- Diff: https://github.com/kamailio/kamailio/commit/fc65a118d15e7942adccd332996701c… Patch: https://github.com/kamailio/kamailio/commit/fc65a118d15e7942adccd332996701c… --- diff --git a/tls_hooks.c b/tls_hooks.c index b46a429..62ddda2 100644 --- a/tls_hooks.c +++ b/tls_hooks.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 iptelorg GmbH + * Copyright (C) 2007 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -34,7 +34,7 @@ static int tls_hooks_loaded=0; int register_tls_hooks(struct tls_hooks* h) { - if (!tls_disable){ + if (!tls_disable) { tls_hook=*h; tls_hooks_loaded++; return 0; @@ -47,7 +47,7 @@ int tls_init(struct socket_info* si) { if (tls_hook.init_si) return tls_hook.init_si(si); - return -1; + return -1; } int tls_has_init_si()

7 years, 11 months

ims_dialog module api structure renamed

by Daniel-Constantin Mierla

Hello, fyi: I renamed the API structure exported by the ims_dialog module because it was using same name as the dialog module, but they were no longer compatible, given the changes since ims_dialog was forked from dialog module. That exposed the risk of modules compiled to use the dialog api module to mistakenly load ims_module api at runtime and access pointers in the structure which were no longer at the same position and with the same meaning. I think I updated all the other modules depending on ims_module api, if you discover some troubles, reportem them. In short: the old 'struct dlg_binds' is replaced by type 'ims_dlg_api_t' (or 'struct ims_dlg_bind') and load_dlg_api() function was replaced by load_ims_dlg_api(). Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com - http://www.kamailio.org http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

7 years, 11 months

git:master:1b124e96: ims_usrloc_scscf: updated to use new name for ims_dialog api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1b124e9671c1f1044a11d85a461b52b5e5f15cd6 URL: https://github.com/kamailio/kamailio/commit/1b124e9671c1f1044a11d85a461b52b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T12:26:16+02:00 ims_usrloc_scscf: updated to use new name for ims_dialog api --- Modified: modules/ims_usrloc_scscf/contact_dlg_handlers.c Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1b124e9671c1f1044a11d85a461b52b… Patch: https://github.com/kamailio/kamailio/commit/1b124e9671c1f1044a11d85a461b52b… --- diff --git a/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/modules/ims_usrloc_scscf/contact_dlg_handlers.c index 0492ffb..aaf1774 100644 --- a/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -12,7 +12,7 @@ #include "../../modules/ims_dialog/dlg_load.h" #include "../../modules/ims_dialog/dlg_hash.h" -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; /*------------------------------------------------------------------------------------\ | Our call back handler function that handles |confirmed|expired|terminated|destroy. | diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 97adf93..0576ff8 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -81,7 +81,7 @@ extern shtable_t sub_dialog_table; extern struct contact_list* contact_list; extern struct ims_subscription_list* ims_subscription_list; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; static ucontact_t* contacts_to_expire [MAX_CONTACTS_PER_IMPU]; //this is done to prevent fragmentation of memory... static int num_contacts_to_expire; diff --git a/modules/ims_usrloc_scscf/ul_mod.c b/modules/ims_usrloc_scscf/ul_mod.c index d416264..f49f15a 100644 --- a/modules/ims_usrloc_scscf/ul_mod.c +++ b/modules/ims_usrloc_scscf/ul_mod.c @@ -117,7 +117,7 @@ str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ unsigned int nat_bflag = (unsigned int)-1; unsigned int init_flag = 0; -struct dlg_binds dlgb; +ims_dlg_api_t dlgb; int sub_dialog_hash_size = 9; shtable_t sub_dialog_table; @@ -199,7 +199,6 @@ struct module_exports exports = { */ static int mod_init(void) { int i; - load_dlg_f load_dlg; if (usrloc_debug){ LM_INFO("Logging usrloc records to %.*s\n", usrloc_debug_file.len, usrloc_debug_file.s); debug_file = fopen(usrloc_debug_file.s, "a"); @@ -346,13 +345,7 @@ static int mod_init(void) { } } - if (!(load_dlg = (load_dlg_f) find_export("load_dlg", 0, 0))) { /* bind to dialog module */ - LM_ERR("can not import load_dlg. This module requires Kamailio dialog module.\n"); - } - if (load_dlg(&dlgb) == -1) { - return -1; - } - if (load_dlg_api(&dlgb) != 0) { /* load the dialog API */ + if (load_ims_dlg_api(&dlgb) != 0) { /* load the dialog API */ LM_ERR("can't load Dialog API\n"); return -1; }

7 years, 11 months

git:master:2d604bee: ims_qos: updated to use new name for ims_dialog api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d604beee15853a831292f835fc98eb76814dff8 URL: https://github.com/kamailio/kamailio/commit/2d604beee15853a831292f835fc98eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T12:25:57+02:00 ims_qos: updated to use new name for ims_dialog api --- Modified: modules/ims_qos/cdpeventprocessor.c Modified: modules/ims_qos/mod.c Modified: modules/ims_qos/rx_authdata.h --- Diff: https://github.com/kamailio/kamailio/commit/2d604beee15853a831292f835fc98eb… Patch: https://github.com/kamailio/kamailio/commit/2d604beee15853a831292f835fc98eb… --- diff --git a/modules/ims_qos/cdpeventprocessor.c b/modules/ims_qos/cdpeventprocessor.c index 82fc2f8..14edd74 100644 --- a/modules/ims_qos/cdpeventprocessor.c +++ b/modules/ims_qos/cdpeventprocessor.c @@ -55,7 +55,7 @@ cdp_cb_event_list_t *cdp_event_list = 0; extern usrloc_api_t ul; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; extern int cdp_event_latency; extern int cdp_event_threshold; extern int cdp_event_latency_loglevel; diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index f57ad85..f088d1a 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -88,7 +88,7 @@ int authorize_video_flow = 1; //by default we authorize resources for video flow struct tm_binds tmb; struct cdp_binds cdpb; -struct dlg_binds dlgb; +ims_dlg_api_t dlgb; bind_usrloc_t bind_usrloc; cdp_avp_bind_t *cdp_avp; usrloc_api_t ul; @@ -244,7 +244,7 @@ static int mod_init(void) } /* load the dialog API */ - if (load_dlg_api(&dlgb) != 0) { + if (load_ims_dlg_api(&dlgb) != 0) { LM_ERR("can't load Dialog API\n"); goto error; } diff --git a/modules/ims_qos/rx_authdata.h b/modules/ims_qos/rx_authdata.h index b186cd0..849d4b7 100644 --- a/modules/ims_qos/rx_authdata.h +++ b/modules/ims_qos/rx_authdata.h @@ -52,7 +52,7 @@ extern struct tm_binds tmb; extern struct cdp_binds cdpb; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; enum dialog_direction { DLG_MOBILE_ORIGINATING = 1,

7 years, 11 months

git:master:67d60fca: ims_charging: updated to use new name for ims_dialog api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 67d60fcace6e06b3efa948a01f6eff05379c707a URL: https://github.com/kamailio/kamailio/commit/67d60fcace6e06b3efa948a01f6eff0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T12:25:19+02:00 ims_charging: updated to use new name for ims_dialog api --- Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/mod.c Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/67d60fcace6e06b3efa948a01f6eff0… Patch: https://github.com/kamailio/kamailio/commit/67d60fcace6e06b3efa948a01f6eff0… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index c0c586f..222aa35 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -37,7 +37,7 @@ extern struct tm_binds tmb; extern struct cdp_binds cdpb; extern client_ro_cfg cfg; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; extern cdp_avp_bind_t *cdp_avp; extern str ro_forced_peer; extern int ro_db_mode; diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index f1f8242..3e927bd 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -63,7 +63,7 @@ client_ro_cfg cfg = { str_init(""), extern struct ims_charging_counters_h ims_charging_cnts_h; struct cdp_binds cdpb; -struct dlg_binds dlgb; +ims_dlg_api_t dlgb; cdp_avp_bind_t *cdp_avp; struct tm_binds tmb; @@ -198,7 +198,7 @@ static int mod_init(void) { goto error; } - if (load_dlg_api(&dlgb) != 0) { /* load the dialog API */ + if (load_ims_dlg_api(&dlgb) != 0) { /* load the dialog API */ LM_ERR("can't load Dialog API\n"); goto error; } diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index 57bf55c..78e8242 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -23,7 +23,7 @@ extern int interim_request_credits; extern int ro_timer_buffer; extern int ro_db_mode; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; extern struct ims_charging_counters_h ims_charging_cnts_h; /*! global dialog timer */

7 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016