sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:pd/outbound: parser: fixed typo
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: f892c3c87b181c4b3d32b080f2dbb8ba0b88807f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f892c3c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:57:59 2013 +0000 parser: fixed typo --- parser/parse_require.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/parse_require.h b/parser/parse_require.h index 0e623dd..3ffaf10 100644 --- a/parser/parse_require.h +++ b/parser/parse_require.h @@ -31,7 +31,7 @@ #define PARSE_REQUIRE_H #include "msg_parser.h" -#include "parser/hf.h" +#include "hf.h" #include "../mem/mem.h" #include "parse_option_tags.h"

1 0

git:pd/outbound: parser: updated path for some of the includes in files moved from lib/kcore
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 98c0aa3930031e681f0211bc7f07e208c2288703 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98c0aa3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:55:34 2013 +0000 parser: updated path for some of the includes in files moved from lib/kcore --- parser/parse_option_tags.c | 2 +- parser/parse_option_tags.h | 4 ++-- parser/parse_require.c | 2 +- parser/parse_require.h | 6 +++--- parser/parse_supported.c | 2 +- parser/parse_supported.h | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/parser/parse_option_tags.c b/parser/parse_option_tags.c index 7d00e8c..e28e1d0 100644 --- a/parser/parse_option_tags.c +++ b/parser/parse_option_tags.c @@ -21,7 +21,7 @@ * */ -#include "../../mem/mem.h" +#include "../mem/mem.h" #include "parse_option_tags.h" static inline void free_option_tag(struct option_tag_body **otb) diff --git a/parser/parse_option_tags.h b/parser/parse_option_tags.h index 2f0c232..c41ce63 100644 --- a/parser/parse_option_tags.h +++ b/parser/parse_option_tags.h @@ -25,8 +25,8 @@ #define OPTION_TAGS_H #include <strings.h> -#include "../../parser/hf.h" -#include "../../parser/keys.h" +#include "hf.h" +#include "keys.h" #define F_OPTION_TAG_PATH (1 << 0) #define F_OPTION_TAG_100REL (1 << 1) diff --git a/parser/parse_require.c b/parser/parse_require.c index 44619a2..6c24598 100644 --- a/parser/parse_require.c +++ b/parser/parse_require.c @@ -26,7 +26,7 @@ * \ingroup parser */ -#include "../../mem/mem.h" +#include "../mem/mem.h" #include "parse_require.h" /*! diff --git a/parser/parse_require.h b/parser/parse_require.h index 2499a58..0e623dd 100644 --- a/parser/parse_require.h +++ b/parser/parse_require.h @@ -30,9 +30,9 @@ #ifndef PARSE_REQUIRE_H #define PARSE_REQUIRE_H -#include "../../parser/msg_parser.h" -#include "../../parser/hf.h" -#include "../../mem/mem.h" +#include "msg_parser.h" +#include "parser/hf.h" +#include "../mem/mem.h" #include "parse_option_tags.h" #define get_require(p_msg) \ diff --git a/parser/parse_supported.c b/parser/parse_supported.c index a7337be..a69bd1d 100644 --- a/parser/parse_supported.c +++ b/parser/parse_supported.c @@ -26,7 +26,7 @@ * \ingroup parser */ -#include "../../mem/mem.h" +#include "../mem/mem.h" #include "parse_supported.h" /*! diff --git a/parser/parse_supported.h b/parser/parse_supported.h index bffbb0d..fb664c3 100644 --- a/parser/parse_supported.h +++ b/parser/parse_supported.h @@ -35,8 +35,8 @@ #ifndef PARSE_SUPPORTED_H #define PARSE_SUPPORTED_H -#include "../../parser/msg_parser.h" -#include "../../mem/mem.h" +#include "msg_parser.h" +#include "../mem/mem.h" #include "parse_option_tags.h" #define get_supported(p_msg) \

1 0

git:pd/outbound: modules/registrar: updated path to parse_( require|supported).h
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 1a920fc0a69916670ad2cd04e85926546e69a2d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a920fc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:51:44 2013 +0000 modules/registrar: updated path to parse_(require|supported).h --- modules/registrar/reply.c | 4 ++-- modules/registrar/save.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 46b1619..b692ef0 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -39,8 +39,8 @@ #include "../../ut.h" #include "../../xavp.h" #include "../../parser/msg_parser.h" -#include "../../lib/kcore/parse_require.h" -#include "../../lib/kcore/parse_supported.h" +#include "../../parser/parse_require.h" +#include "../../parser/parse_supported.h" #include "../../data_lump_rpl.h" #include "../usrloc/usrloc.h" #include "rerrno.h" diff --git a/modules/registrar/save.c b/modules/registrar/save.c index c4bfb02..8737df0 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -62,8 +62,8 @@ #include "../../mod_fix.h" #include "../../lib/srutils/sruid.h" #include "../../lib/kcore/cmpapi.h" -#include "../../lib/kcore/parse_require.h" -#include "../../lib/kcore/parse_supported.h" +#include "../../parser/parse_require.h" +#include "../../parser/parse_supported.h" #include "../../lib/kcore/statistics.h" #ifdef USE_TCP #include "../../tcp_server.h"

1 0

git:pd/outbound: modules/sst: updated path to parse_supported.h
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 19ff7249507118ddfcf34e8dd02407ae3663314f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19ff724… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:52:33 2013 +0000 modules/sst: updated path to parse_supported.h --- modules/sst/sst_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sst/sst_handlers.c b/modules/sst/sst_handlers.c index 20632ed..2a7b007 100644 --- a/modules/sst/sst_handlers.c +++ b/modules/sst/sst_handlers.c @@ -55,7 +55,7 @@ #include "../../pvar.h" #include "../../lib/kcore/parse_sst.h" -#include "../../lib/kcore/parse_supported.h" +#include "../../parser/parse_supported.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" #include "../../data_lump.h"

1 0

git:pd/outbound: modules/rls: updated path to parse_supported.h
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 59189c400f807deb92b5ee897ea2e19cc086c500 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59189c4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:52:18 2013 +0000 modules/rls: updated path to parse_supported.h --- modules/rls/subscribe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index d1034ca..3bedf65 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -35,7 +35,7 @@ #include "../../data_lump_rpl.h" #include "../../lib/kcore/cmpapi.h" #include "../../hashes.h" -#include "../../lib/kcore/parse_supported.h" +#include "../../parser/parse_supported.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_event.h" #include "../../parser/parse_expires.h"

1 0

git:pd/outbound: modules/ims_registrar_scscf: updated path to parse_supported.h
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 0497e50dfe195e3b633741f2fcb476ff234285f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0497e50… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:51:11 2013 +0000 modules/ims_registrar_scscf: updated path to parse_supported.h --- modules/ims_registrar_scscf/reply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_scscf/reply.c b/modules/ims_registrar_scscf/reply.c index 70a28c7..64b31c3 100644 --- a/modules/ims_registrar_scscf/reply.c +++ b/modules/ims_registrar_scscf/reply.c @@ -38,7 +38,7 @@ #include "../../ut.h" #include "../../parser/msg_parser.h" #include "../../parser/contact/contact.h" -#include "../../lib/kcore/parse_supported.h" +#include "../../parser/parse_supported.h" #include "../../data_lump_rpl.h" #include "../ims_usrloc_scscf/usrloc.h" #include "rerrno.h"

1 0

git:pd/outbound: lib/kcore, parser: moved parse_( options_tags|require|supported) to parser
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 96347fb3b2d747712c52579abec081b8eec545d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96347fb… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:50:20 2013 +0000 lib/kcore, parser: moved parse_(options_tags|require|supported) to parser --- .../option-tags.c => parser/parse_option_tags.c | 4 +++- .../option-tags.h => parser/parse_option_tags.h | 2 ++ {lib/kcore => parser}/parse_require.c | 2 ++ {lib/kcore => parser}/parse_require.h | 4 +++- {lib/kcore => parser}/parse_supported.c | 0 {lib/kcore => parser}/parse_supported.h | 2 +- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/kcore/option-tags.c b/parser/parse_option_tags.c similarity index 92% rename from lib/kcore/option-tags.c rename to parser/parse_option_tags.c index 22aac32..7d00e8c 100644 --- a/lib/kcore/option-tags.c +++ b/parser/parse_option_tags.c @@ -1,6 +1,8 @@ /* * $Id$ * + * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -20,7 +22,7 @@ */ #include "../../mem/mem.h" -#include "option-tags.h" +#include "parse_option_tags.h" static inline void free_option_tag(struct option_tag_body **otb) { diff --git a/lib/kcore/option-tags.h b/parser/parse_option_tags.h similarity index 98% rename from lib/kcore/option-tags.h rename to parser/parse_option_tags.h index 0f2c1f2..2f0c232 100644 --- a/lib/kcore/option-tags.h +++ b/parser/parse_option_tags.h @@ -1,6 +1,8 @@ /* * $Id$ * + * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify diff --git a/lib/kcore/parse_require.c b/parser/parse_require.c similarity index 96% rename from lib/kcore/parse_require.c rename to parser/parse_require.c index 7bb1a3d..44619a2 100644 --- a/lib/kcore/parse_require.c +++ b/parser/parse_require.c @@ -1,6 +1,8 @@ /* * $Id$ * + * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify diff --git a/lib/kcore/parse_require.h b/parser/parse_require.h similarity index 93% rename from lib/kcore/parse_require.h rename to parser/parse_require.h index 9214455..2499a58 100644 --- a/lib/kcore/parse_require.h +++ b/parser/parse_require.h @@ -1,6 +1,8 @@ /* * $Id$ * + * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -31,7 +33,7 @@ #include "../../parser/msg_parser.h" #include "../../parser/hf.h" #include "../../mem/mem.h" -#include "option-tags.h" +#include "parse_option_tags.h" #define get_require(p_msg) \ ((p_msg)->require ? ((struct option_tag_body*)(p_msg)->require->parsed)->option_tags_all : 0) diff --git a/lib/kcore/parse_supported.c b/parser/parse_supported.c similarity index 100% rename from lib/kcore/parse_supported.c rename to parser/parse_supported.c diff --git a/lib/kcore/parse_supported.h b/parser/parse_supported.h similarity index 97% rename from lib/kcore/parse_supported.h rename to parser/parse_supported.h index 77eb65a..bffbb0d 100644 --- a/lib/kcore/parse_supported.h +++ b/parser/parse_supported.h @@ -37,7 +37,7 @@ #include "../../parser/msg_parser.h" #include "../../mem/mem.h" -#include "option-tags.h" +#include "parse_option_tags.h" #define get_supported(p_msg) \ ((p_msg)->supported ? ((struct option_tag_body*)(p_msg)->supported->parsed)->option_tags_all : 0)

1 0

git:master: sca: fix private hold handling
by Andrew Mortensen 14 Mar '13

14 Mar '13

Module: sip-router Branch: master Commit: 81b5473f5a191a5aa81295acf0d96a22160f7f31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81b5473… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Mar 1 16:33:59 2013 -0500 sca: fix private hold handling - private hold call-info was being ignored in hold reINVITEs, causing inaccurate "active" notifications to go to subscribers. --- modules/sca/sca_appearance.h | 3 +++ modules/sca/sca_call_info.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index 0d0abd8..63f2a78 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -38,6 +38,9 @@ enum { SCA_APPEARANCE_STATE_HELD_PRIVATE, SCA_APPEARANCE_STATE_UNKNOWN = 0xff, }; +#define sca_appearance_is_held( app1 ) \ + ((app1) && ((app1)->state == SCA_APPEARANCE_STATE_HELD || \ + (app1)->state == SCA_APPEARANCE_STATE_HELD_PRIVATE)) enum { SCA_APPEARANCE_FLAG_DEFAULT = 0, diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index baea8bd..0195b0e 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -982,6 +982,11 @@ sca_call_info_invite_request_handler( sip_msg_t *msg, sca_call_info *call_info, if ( sca_call_is_held( msg )) { state = SCA_APPEARANCE_STATE_HELD; + if ( call_info->state == SCA_APPEARANCE_STATE_HELD_PRIVATE ) { + state = SCA_APPEARANCE_STATE_HELD_PRIVATE; + } else { + state = SCA_APPEARANCE_STATE_HELD; + } } else if ( !SCA_STR_EMPTY( &to->tag_value )) { /* this is a reINVITE from an SCA line that put the call on hold */ state = SCA_APPEARANCE_STATE_ACTIVE; @@ -1237,7 +1242,7 @@ sca_call_info_invite_reply_200_handler( sip_msg_t *msg, goto done; } - if ( app->state != SCA_APPEARANCE_STATE_HELD ) { + if ( !sca_appearance_is_held( app )) { state = SCA_APPEARANCE_STATE_ACTIVE; } /* if a Call-Info header is present, app-index goes to Contact */

1 0

git:master: modules/app_java - New module app_java: Java Native Interface support.
by Konstantin Mosesov 14 Mar '13

14 Mar '13

Module: sip-router Branch: master Commit: c5f47af145e19f11fafc3ca570e994185f33542d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5f47af… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Wed Mar 13 17:53:54 2013 +0200 modules/app_java - New module app_java: Java Native Interface support. --- modules/app_java/BUILDING_JAR.TXT | 54 + modules/app_java/Makefile | 29 + modules/app_java/QUICKSTART.TXT | 25 + modules/app_java/global.h | 48 + modules/app_java/java_iface.c | 284 +++++ modules/app_java/java_iface.h | 44 + modules/app_java/java_mod.c | 260 +++++ modules/app_java/java_mod.h | 30 + modules/app_java/java_msgobj.c | 324 ++++++ modules/app_java/java_msgobj.h | 34 + modules/app_java/java_native_methods.c | 1223 ++++++++++++++++++++ modules/app_java/java_native_methods.h | 86 ++ modules/app_java/java_sig_parser.c | 439 +++++++ modules/app_java/java_sig_parser.h | 50 + modules/app_java/java_support.c | 207 ++++ modules/app_java/java_support.h | 37 + .../java-untested/Kamailio.class | Bin 0 -> 2340 bytes .../java-untested/Kamailio.java | 388 +++++++ .../java-untested/WrappedMethods.java | 87 ++ .../kamailio_java_folder/java-untested/build.xml | 46 + .../java-untested/kamailio.jar | Bin 0 -> 3630 bytes .../java-untested/siprouter_src/CoreMethods.java | 34 + .../java-untested/siprouter_src/IPPair.java | 15 + .../siprouter_src/NativeInterface.java | 46 + .../java-untested/siprouter_src/NativeMethods.java | 22 + .../java-untested/siprouter_src/SipMsg.java | 43 + .../kamailio_java_folder/java/Kamailio.class | Bin 0 -> 2848 bytes .../kamailio_java_folder/java/Kamailio.java | 130 +++ .../app_java/kamailio_java_folder/java/build.xml | 46 + .../kamailio_java_folder/java/kamailio.jar | Bin 0 -> 3176 bytes .../java/siprouter_src/IPPair.java | 15 + .../java/siprouter_src/NativeInterface.java | 46 + .../java/siprouter_src/NativeMethods.java | 23 + .../java/siprouter_src/SipMsg.java | 43 + modules/app_java/utils.c | 137 +++ modules/app_java/utils.h | 39 + 36 files changed, 4334 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c5f…

5 6

Parsing requires and supported in modules
by Peter Dunkley 14 Mar '13

14 Mar '13

Hello, I have been working on some outbound related fixes (problems identified by Olle during SIPit). Some of these require me to parse the "Require:" header. There is already a parser for "Supported:" in "lib/kcore" and the parsing for "Require:" is almost identical. To this end I have abstracted a lot of the code from "parse_supported.[ch]" into new "options-tags.[ch]" files and have a much shorter "parse_supported.[ch]" and "parse_require.[ch]" that use the options-tags parser. Another advantage of this is that it will simplify the writing of proper parsers for other similar headers in HTTP (for example, the "Sec-WebSocket-Protocol:" header used during the WebSocket handshake. Now that I've done this I would like to move these parser files from "lib/kcore" into "parser". Is there any reason I shouldn't do this? The code can be found in the pd/outbound branch. Regards, Peter

2 3

← Newer
1
...
25
26
27
28
29
30
31
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013