kamailio.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
List overview
Download
sr-dev
April 2009
----- 2024 -----
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
sr-dev@lists.kamailio.org
13 participants
230 discussions
Start a n
N
ew thread
git:master: mangler(s): missing extern
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: bc0a1dab6aacd35e74bef1f6818b240e09289307 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc0a1da…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:34:20 2009 +0200 mangler(s): missing extern --- modules_s/mangler/sdp_mangler.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/mangler/sdp_mangler.h b/modules_s/mangler/sdp_mangler.h index 093b9fc..a9488d7 100644 --- a/modules_s/mangler/sdp_mangler.h +++ b/modules_s/mangler/sdp_mangler.h @@ -70,8 +70,8 @@ from the last group -regex_t *portExpression; -regex_t *ipExpression; +extern regex_t *portExpression; +extern regex_t *ipExpression;
15 years, 5 months
1
0
0
0
git:master: rr(s): missing extern for avp_flag_dialog
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: abf23e8a75880e0f6f024abfb606e7809c0d54fe URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abf23e8…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:34:57 2009 +0200 rr(s): missing extern for avp_flag_dialog --- modules_s/rr/avp_cookie.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/rr/avp_cookie.h b/modules_s/rr/avp_cookie.h index 1781389..86b4118 100644 --- a/modules_s/rr/avp_cookie.h +++ b/modules_s/rr/avp_cookie.h @@ -46,7 +46,7 @@ typedef struct avp_save_item_t { extern regex_t* cookie_filter_re; extern unsigned short crc_secret; -avp_flags_t avp_flag_dialog; +extern avp_flags_t avp_flag_dialog; int rr_add_avp_cookie(struct sip_msg *msg, char *param1, char *param2); str *rr_get_avp_cookies(void);
15 years, 5 months
1
0
0
0
git:master: pua_usrloc(k): missing extern for pua_send_publish & pua_send_subscribe
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: 67b6c6fffaf16d5843be23b3372ecb8aa7a7037e URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67b6c6f…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:31:15 2009 +0200 pua_usrloc(k): missing extern for pua_send_publish & pua_send_subscribe --- modules_k/pua_usrloc/pua_usrloc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pua_usrloc/pua_usrloc.h b/modules_k/pua_usrloc/pua_usrloc.h index 7be83c0..594c5e1 100644 --- a/modules_k/pua_usrloc/pua_usrloc.h +++ b/modules_k/pua_usrloc/pua_usrloc.h @@ -26,8 +26,8 @@ #define _PUA_UL #include "../pua/pua_bind.h" -send_publish_t pua_send_publish; -send_subscribe_t pua_send_subscribe; +extern send_publish_t pua_send_publish; +extern send_subscribe_t pua_send_subscribe; void ul_publish(ucontact_t* c, int type, void* param); int pua_unset_publish(struct sip_msg* msg , void* param);
15 years, 5 months
1
0
0
0
git:master: registrar(k): missing extern for ul
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: 611b511e251a85cf837300df77e323f3a1eff155 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=611b511…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:31:57 2009 +0200 registrar(k): missing extern for ul --- modules_k/registrar/reg_mod.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index 33209ee..2d50de6 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -98,7 +98,7 @@ extern int path_use_params; extern str sock_hdr_name; extern int sock_flag; -usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions */ +extern usrloc_api_t ul;/*!< Structure containing pointers to usrloc functions*/ extern struct sl_binds slb;
15 years, 5 months
1
0
0
0
git:master: pua_dialoginfo(k): missing extern for pua_send_publish
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: bf06ff14f4c1a2718312de33a132f54c9eb36eda URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf06ff1…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:30:32 2009 +0200 pua_dialoginfo(k): missing extern for pua_send_publish --- modules_k/pua_dialoginfo/pua_dialoginfo.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.h b/modules_k/pua_dialoginfo/pua_dialoginfo.h index 054e550..627fced 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.h +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.h @@ -27,7 +27,7 @@ #define _PUA_DLGINFO_H #include "../pua/pua_bind.h" -send_publish_t pua_send_publish; +extern send_publish_t pua_send_publish; void dialog_publish(char *state, str *entity, str *peer, str *callid, unsigned int initiator, unsigned int lifetime, str *localtag, str *remotetag);
15 years, 5 months
1
0
0
0
git:master: auth_diameter(k): missing extern for sockfd & use_domain
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: a80b7ab7c8c2baab77db2568b76e3d680c691fe4 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a80b7ab…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:27:58 2009 +0200 auth_diameter(k): missing extern for sockfd & use_domain --- modules_k/auth_diameter/auth_diameter.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/auth_diameter/auth_diameter.h b/modules_k/auth_diameter/auth_diameter.h index 9ceca00..038edec 100644 --- a/modules_k/auth_diameter/auth_diameter.h +++ b/modules_k/auth_diameter/auth_diameter.h @@ -41,8 +41,8 @@ extern int diameter_client_port; /** SL binds */ extern struct sl_binds slb; -int sockfd; -int use_domain; +extern int sockfd; +extern int use_domain; extern rd_buf_t *rb;
15 years, 5 months
1
0
0
0
git:master: dispatcher(k): missing extern for tmb
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: 441ab3c9f2caf393474c1460153ec27d9177e387 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=441ab3c…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:29:48 2009 +0200 dispatcher(k): missing extern for tmb --- modules_k/dispatcher/dispatch.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h index a954e0d..e735475 100644 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -76,7 +76,7 @@ extern str ds_setid_pvname; extern pv_spec_t ds_setid_pv; /* Structure containing pointers to TM-functions */ -struct tm_binds tmb; +extern struct tm_binds tmb; extern str ds_ping_method; extern str ds_ping_from; extern int probing_threshhold; /*!< number of failed requests,
15 years, 5 months
1
0
0
0
git:master: tm: _tm_table should be extern
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: efbb8d1d0fc0f9a560d085a133699a9b23bd075f URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efbb8d1…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:24:08 2009 +0200 tm: _tm_table should be extern - _tm_table was declared in h_table.h without "extern", causing a _tm_table symbol to be created in each module including h_table.h. Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules/tm/h_table.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index d38e3d6..dd18820 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -424,7 +424,8 @@ struct s_table /* pointer to the big table where all the transaction data lives */ -struct s_table* _tm_table; /* private internal stuff, don't touch directly */ +extern struct s_table* _tm_table; /* private internal stuff, don't touch + directly */ #define list_entry(ptr, type, member) \ ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
15 years, 5 months
1
0
0
0
git:master: tm: missing extern for rpc_cancel_doc[]
by Andrei Pelinescu-Onciul
Module: sip-router Branch: master Commit: ea982a3a4dad156143c35e9d1c6f32d3f5f8de9c URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea982a3…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 29 17:25:56 2009 +0200 tm: missing extern for rpc_cancel_doc[] --- modules/tm/t_cancel.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 759f4f0..2ae96f2 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -113,7 +113,7 @@ inline short static should_cancel_branch( struct cell *t, int b, int noreply ) return 0; } -const char* rpc_cancel_doc[2]; +extern const char* rpc_cancel_doc[2]; void rpc_cancel(rpc_t* rpc, void* c); int cancel_b_flags_fixup(void* handle, str* gname, str* name, void** val); int cancel_b_flags_get(unsigned int* f, int m);
15 years, 5 months
1
0
0
0
git:master: RURI manipulating functions have been fixed to preserve
by Miklos Tirpak
Module: sip-router Branch: master Commit: 773f8568be5594674a982a981c4bc4b7a6d4eef1 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=773f856…
Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Apr 29 15:55:13 2009 +0200 RURI manipulating functions have been fixed to preserve tel: URI parameters - parameters of a tel: URI embedded in a sip URI had been lost when SET_USER_T action was called for instance. ("sip:123;param=val@foo.com;user=phone" became "sip:456@foo.com;user=phone" after rewriting the user name.) - sip_params variable is added to sip_uri structure to store the original sip: URI parameters. --- action.c | 37 ++++++++++++++++++++++--------------- parser/msg_parser.h | 5 +++++ parser/parse_uri.c | 3 +++ 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/action.c b/action.c index 1e89a64..ffc0051 100644 --- a/action.c +++ b/action.c @@ -123,7 +123,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct rvalue* rv1; struct rval_cache c1; str s; - int orig_p2t; /* reset the value of error to E_UNSPEC so avoid unknowledgable functions to return with error (status<0) and not setting it @@ -538,7 +537,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=1; break; } - if ((msg->parsed_uri_ok==0) || ((uri.flags & URI_SIP_USER_PHONE)!=0)) { + if (msg->parsed_uri_ok==0) { if (msg->new_uri.s) { tmp=msg->new_uri.s; len=msg->new_uri.len; @@ -546,18 +545,12 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) tmp=msg->first_line.u.request.uri.s; len=msg->first_line.u.request.uri.len; } - /* don't convert sip:user=phone to tel, otherwise we loose parameters */ - orig_p2t=phone2tel; - phone2tel=0; - msg->parsed_uri_ok=0; if (parse_uri(tmp, len, &uri)<0){ - phone2tel=orig_p2t; LOG(L_ERR, "ERROR: do_action: bad uri <%s>, dropping" " packet\n", tmp); ret=E_UNSPEC; break; } - phone2tel=orig_p2t; } else { uri=msg->parsed_uri; } @@ -701,6 +694,17 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) *crt=':'; crt++; memcpy(crt,tmp,len);crt+=len; } + /* tel: URI parameters */ + if ((uri.type==TEL_URI_T) + || (uri.type==TELS_URI_T) + ) { + tmp=uri.params.s; + if (tmp){ + len=uri.params.len; if(crt+len+1>end) goto error_uri; + *crt=';'; crt++; + memcpy(crt,tmp,len);crt+=len; + } + } /* host */ if ((a->type==SET_HOST_T) || (a->type==SET_HOSTPORT_T) @@ -747,17 +751,20 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) memcpy(crt,tmp,len);crt+=len; } /* params */ - if ((a->type==SET_HOSTPORTTRANS_T) && uri.transport.s) { + if ((a->type==SET_HOSTPORTTRANS_T) + && uri.sip_params.s + && uri.transport.s + ) { /* bypass the transport parameter */ - if (uri.params.s < uri.transport.s) { + if (uri.sip_params.s < uri.transport.s) { /* there are parameters before transport */ - len = uri.transport.s - uri.params.s - 1; + len = uri.transport.s - uri.sip_params.s - 1; /* ignore the ';' at the end */ if (crt+len+1>end) goto error_uri; *crt=';'; crt++; - memcpy(crt,uri.params.s,len);crt+=len; + memcpy(crt,uri.sip_params.s,len);crt+=len; } - len = (uri.params.s + uri.params.len) - + len = (uri.sip_params.s + uri.sip_params.len) - (uri.transport.s + uri.transport.len); if (len > 0) { /* there are parameters after transport */ @@ -766,9 +773,9 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) memcpy(crt,tmp,len);crt+=len; } } else { - tmp=uri.params.s; + tmp=uri.sip_params.s; if (tmp){ - len=uri.params.len; if(crt+len+1>end) goto error_uri; + len=uri.sip_params.len; if(crt+len+1>end) goto error_uri; *crt=';'; crt++; memcpy(crt,tmp,len);crt+=len; } diff --git a/parser/msg_parser.h b/parser/msg_parser.h index b8edc6b..ece6b18 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -188,6 +188,11 @@ struct sip_uri { str host; /* Host name */ str port; /* Port number */ str params; /* Parameters */ + str sip_params; /* Parameters of the sip: URI. + * (If a tel: URI is embedded in a sip: URI, then + * params points to the parameters of the tel: URI, + * and sip_params to the parameters of the sip: URI. + */ str headers; unsigned short port_no; unsigned short proto; /* from transport */ diff --git a/parser/parse_uri.c b/parser/parse_uri.c index 85328f8..5b29710 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -1102,6 +1102,8 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) switch(uri->type){ case SIPS_URI_T: case SIP_URI_T: + /* save the original sip: URI parameters in sip_params */ + uri->sip_params=uri->params; if ((phone2tel) && (uri->user_param_val.len == 5) && (strncmp(uri->user_param_val.s, "phone", 5) == 0) @@ -1120,6 +1122,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) uri->params.len=uri->user.s+uri->user.len-uri->params.s; uri->user.len=p-uri->user.s; } else { + uri->params.s=0; uri->params.len=0; } } else {
15 years, 5 months
1
0
0
0
← Newer
1
2
3
4
5
...
23
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
Results per page:
10
25
50
100
200