- sr-dev - kamailio.org

[kamailio/kamailio] Kamailio sending CCR TERMINATE request without waiting for the CCR INITIAL request response (#2143)
by harishyadav1465 03 Aug '23

03 Aug '23

**Description** We are using ims_charging module and Freediameter as diameter server for billing process....recently we faced one issue...For Initial **INVITEs** kamailio sending **CCR request (INITIAL_REQUEST)** to **diameter server** but if we receive Immediate **CANCLE** for the **INVITE**, kamailio sending **CCR request ( TERMINATE_REQUEST )** without waiting for the **CCR request (INITIAL_REQUEST) response** from the **Diameter server.**.. **Expected behavior** Kamailio has to send **CCR request ( TERMINATE_REQUEST )** after getting the **response** from the **INITIAL_REQUEST.** **Additional Info** kamailio server : 4.2 platform : linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2143

3 6

[kamailio/kamailio] acc_cdrs表是空的 (Issue #3527)
by kqbi 31 Jul '23

31 Jul '23

软电话注册到kamailio上打电话，数据库acc表有invite记录，但是acc_cdrs表示空的这是为什么，是我哪里配的不对吗，配置文件如下： ``` #!KAMAILIO # # Kamailio SIP Server v5.6 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio # # Direct your questions about this file to: <sr-users(a)lists.kamailio.org> # # Refer to the Core CookBook at https://www.kamailio.org/wikidocs/ # for an explanation of possible statements, functions and parameters. # # Note: the comments can be: # - lines starting with #, but not the pre-processor directives, # which start with #!, like #!define, #!ifdef, #!endif, #!else, #!trydef, # #!subst, #!substdef, ... # - lines starting with // # - blocks enclosed in between /* */ # Note: the config performs symmetric SIP signaling # - it sends the reply to the source address of the request # - remove the use of force_rport() for asymmetric SIP signaling # # Several features can be enabled using '#!define WITH_FEATURE' directives: # # *** To run in debug mode: # - define WITH_DEBUG # - debug level increased to 3, logs still sent to syslog # - debugger module loaded with cfgtrace enabled # # *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute: # - enable mysql # - define WITH_AUTH # - add users using 'kamctl' or 'kamcli' # # *** To enable IP authentication execute: # - enable mysql # - enable authentication # - define WITH_IPAUTH # - add IP addresses with group id '1' to 'address' table # # *** To enable persistent user location execute: # - enable mysql # - define WITH_USRLOCDB # # *** To enable presence server execute: # - enable mysql # - define WITH_PRESENCE # - if modified headers or body in config must be used by presence handling: # - define WITH_MSGREBUILD # # *** To enable nat traversal execute: # - define WITH_NAT # - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # - install RTPProxy: http://www.rtpproxy.org # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # # *** To use RTPEngine (instead of RTPProxy) for nat traversal execute: # - define WITH_RTPENGINE # - install RTPEngine: https://github.com/sipwise/rtpengine # - start RTPEngine: # rtpengine --listen-ng=127.0.0.1:2223 ... # # *** To enable PSTN gateway routing execute: # - define WITH_PSTN # - set the value of pstn.gw_ip # - check route[PSTN] for regexp routing condition # # *** To enable database aliases lookup execute: # - enable mysql # - define WITH_ALIASDB # # *** To enable speed dial lookup execute: # - enable mysql # - define WITH_SPEEDDIAL # # *** To enable multi-domain support execute: # - enable mysql # - define WITH_MULTIDOMAIN # # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # # *** To enable JSONRPC over HTTP(S) support execute: # - define WITH_JSONRPC # - adjust event_route[xhttp:request] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # # *** To load htable module execute: # - define WITH_HTABLE # # *** To block 3XX redirect replies execute: # - define WITH_BLOCK3XX # # *** To block 401 and 407 authentication replies execute: # - define WITH_BLOCK401407 # # *** To enable VoiceMail routing execute: # - define WITH_VOICEMAIL # - set the value of voicemail.srv_ip # - adjust the value of voicemail.srv_port # # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB # - add following columns to database #!define WITH_DEBUG #!define WITH_MYSQL #!define WITH_NAT #!define WITH_RTPENGINE #!define WITH_ACCDB #!ifdef ACCDB_COMMENT ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif ####### Include Local Config If Exists ######### import_file "kamailio-local.cfg" server_header="Server: My Super SIP Server" ####### Defined Values ######### # *** Value defines - IDs used later in config #!ifdef WITH_DEBUG #!define DBGLEVEL 3 #!else #!define DBGLEVEL 3 #!endif #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL #!define DBURL "mysql://root:!Flytek@2022@172.30.91.47:3306/kamailio" #!endif #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif #!ifdef WITH_ANTIFLOOD # - hash table 'ipban' used to store blocked IP addresses #!trydef WITH_HTABLE #!endif # - flags # FLT_ - per transaction (message) flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 # FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 ####### Global Parameters ######### /* LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR, ... */ debug=DBGLEVEL /* set to 'yes' to print log messages to terminal or use '-E' cli option */ log_stderror=no memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes for each UDP socket * - value inherited by tcp_children and sctp_children when not set explicitely */ children=8 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes /* number of SIP routing processes for all TCP/TLS sockets */ # tcp_children=8 /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=no /* add local domain aliases - it can be set many times */ alias="172.31.223.87" /* listen sockets - if none set, Kamailio binds to all local IP addresses * - basic prototype (full prototype can be found in Wiki - Core Cookbook): * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ listen=udp:0.0.0.0:5090 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif #!ifdef WITH_TLS enable_tls=yes /* upper limit for TLS connections */ tls_max_connections=2048 #!endif /* set it to yes to enable sctp and load sctp.so module */ enable_sctp=no ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description * Access: $sel(cfg_get.group.id) or @cfg_get.group.id */ #!ifdef WITH_PSTN /* PSTN GW Routing * * - pstn.gw_ip: valid IP or hostname as string value, example: * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ pstn.gw_ip = "" desc "PSTN GW Address" pstn.gw_port = "" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL /* VoiceMail Routing on offline, busy or no answer * * - by default Voicemail server IP is empty to avoid misrouting */ voicemail.srv_ip = "" desc "VoiceMail IP Address" voicemail.srv_port = "5060" desc "VoiceMail Port" #!endif ####### Modules Section ######## /* set paths to location of modules */ # mpath="/mnt/vdd/kqbi2/install/kamailio/lib64/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif #!ifdef WITH_JSONRPC loadmodule "xhttp.so" #!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "textopsx.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" loadmodule "dialog.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_ALIASDB loadmodule "alias_db.so" #!endif #!ifdef WITH_SPEEDDIAL loadmodule "speeddial.so" #!endif #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_NAT loadmodule "nathelper.so" #!ifdef WITH_RTPENGINE loadmodule "rtpengine.so" #!else loadmodule "rtpproxy.so" #!endif #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_HTABLE loadmodule "htable.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") #!ifdef WITH_JSONRPC modparam("jsonrpcs", "transport", 7) #!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- sanity params ----- modparam("sanity", "autodrop", 0) # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ # modparam("registrar", "append_branches", 0) /* uncomment the next line not to allow more than 10 contacts per AOR */ # modparam("registrar", "max_contacts", 10) /* max value for expires of registrations */ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) /* set it to 0 to disable Path handling */ modparam("registrar", "use_path", 1) /* save Path even if not listed in Supported header */ modparam("registrar", "path_mode", 0) # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) /* by default ww do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ modparam("acc", "log_level", 2) modparam("acc", "log_flag", FLT_ACC) modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB modparam("acc", "db_flag", FLT_ACC) modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "cdr_enable", 1) modparam("acc", "db_insert_mode", 1) modparam("acc", "cdr_start_id", "start") modparam("acc", "cdr_end_id", "end") modparam("acc", "cdr_duration_id", "d") modparam("acc", "cdr_log_enable", 1) #modparam("acc", "time_mode", 1) #modparam("acc", "time_attr", "seconds") modparam("acc", "cdrs_table", "acc_cdrs") modparam("dialog", "db_mode", 0) modparam("dialog", "hash_size", 1024) modparam("dialog", "enable_stats", 1) modparam("dialog", "profiles_with_value", "caller") modparam("dialog", "track_cseq_updates", 1) #!endif # ----- usrloc params ----- modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 1) modparam("usrloc", "use_domain", MULTIDOMAIN) /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") modparam("auth_db", "use_domain", MULTIDOMAIN) # ----- permissions params ----- #!ifdef WITH_IPAUTH modparam("permissions", "db_url", DBURL) modparam("permissions", "load_backends", 1) #!endif #!endif # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) /* register callback to match myself condition with domains list */ modparam("domain", "register_myself", 1) #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- #modparam("rtpengine", "rtpengine_sock", "udp:172.30.91.47:5090") modparam("rtpengine", "db_url", DBURL) modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") modparam("rtpengine", "setid_avp", "$avp(setid)") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") #!endif # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") # params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/mnt/vdd/kqbi2/install/kamailio/etc/kamailio/tls.cfg") #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) #!endif #!ifdef WITH_HTABLE # ----- htable params ----- #!ifdef WITH_ANTIFLOOD /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif ####### Routing Logic ######## // 定义开关负载均衡dispatcher 模块 #!define WITH_LOADBALANCE // 加载模块，注意放置到所有loadmodule的最后 #!ifdef WITH_LOADBALANCE loadmodule "dispatcher.so" #!endif #modparam("tm", "reparse_invite", 0) #modparam("dispatcher", "list_file", "/mnt/vdd/kqbi2/install/kamailio/etc/kamailio/dispatcher.list") modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks route(REQINIT); # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE|BYE")) { record_route(); } # account only INVITEs if (is_method("INVITE|BYE")) { setflag(FLT_ACC); # do accounting setflag(FLT_ACCFAILED); # do accounting } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU==$null) { # request with no Username in RURI sl_send_reply("484", "Address Incomplete"); exit; } # dispatch destinations to PSTN route(PSTN); # dispatch destinations route(DISPATCH); # user location service route(LOCATION); if (is_method("INVITE")) { if (has_body("application/sdp")) { if (rtpengine_offer("replace-origin replace-session-connection direction=pub direction=priv")) t_on_reply("1"); } else { t_on_reply("2"); } } if (is_method("ACK") && has_body("application/sdp")) { rtpengine_answer(); } if (is_method("BYE")) { rtpengine_delete(); } return; } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { # no connect for sending replies set_reply_no_connect(); # enforce symmetric signaling # - send back replies to the source address of request force_rport(); #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT", "ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } if (!mf_process_maxfwd_header("10")) { sl_send_reply("483", "Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200", "Keepalive"); exit; } if(!sanity_check("17895", "7")) { xlog("Malformed SIP request from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request within a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404", "Not here"); exit; } # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE #!ifdef WITH_MSGREBUILD # apply changes in case the request headers or body were modified msg_apply_changes(); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403", "Not relaying"); exit; } #!else # authentication not enabled - do not relay at all to foreign networks if(uri!=myself) { sl_send_reply("403", "Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTP relaying management and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE if(nat_uac_test("8")) { rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); } else { rtpengine_manage("replace-origin replace-session-connection"); } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-Hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } # normalize target number for pstn gateway # - convert leading 00 to + if (starts_with("$rU", "00")) { strip(2); prefix("+"); } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # JSONRPC over HTTP(S) routing #!ifdef WITH_JSONRPC event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if(src_ip!=127.0.0.1) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>Not allowed from $si</body></html>"); exit; } if ($hu =~ "^/RPC") { jsonrpc_dispatch(); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); exit; } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); return; } # Manage incoming replies reply_route { if(!sanity_check("17604", "6")) { xlog("Malformed SIP response from $si:$sp\n"); drop; } return; } # Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } return; } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404", "Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404", "Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif return; } # Dispatch requests route[DISPATCH] { # round robin dispatching on gateways group '1' if(!ds_select_dst("1", "4")) { send_reply("404", "No destination"); exit; } xdbg("--- SCRIPT: going to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; } # Try next destionations in failure route failure_route[RTF_DISPATCH] { if (t_is_canceled()) { exit; } # next DST - only for 500 or local timeout if (t_check_status("500") or (t_branch_timeout() and !t_branch_replied())) { if(ds_next_dst()) { xdbg("--- SCRIPT: retrying to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; } } } onreply_route[1] { if (has_body("application/sdp")) rtpengine_answer("replace-origin replace-session-connection direction=priv direction=pub"); } onreply_route[2] { if (has_body("application/sdp")) rtpengine_offer(); } ``` ![i讯飞图片_1690774069088](https://github.com/kamailio/kamailio/assets/40823194/0d55e36f-ce10-42ec-9941-b6110de2f60a) ![i讯飞图片_1690774076035](https://github.com/kamailio/kamailio/assets/40823194/0dd92965-7d96-442b-bb7a-9c16e48a7f4e) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3527 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3527(a)github.com>

2 1

[kamailio/kamailio] siptrace: frong IPv4 address value (#2092)
by sergey-safarov 30 Jul '23

30 Jul '23

### Description Please check attached pcap. [siptrace.pcap.gz](https://github.com/kamailio/kamailio/files/3688791/siptra… Kamailio send INVITE (packet 1) from port `TCP/42394`. SIP trace encapsulate INVITE (packet 2) and encodes Kamailio source port `TCP/5060` #### Debugging Data HEP header parsed by lua [disector](https://github.com/sipcapture/hep-wireshark) ``` HEP3 Protocol HEP ID: HEP3 Length (Bytes): 1574 Protocol family: IPv4 Protocol ID: TCP Source IPv4 address: 172.21.0.131 Destination IPv4 address: 192.168.57.11 Source port: 5060 Destination port: 5060 Timestamp: 1570150645 Timestamp us: 740165 Protocol Type: SIP Capture ID: 1 Payload [truncated]: INVITE sip:911@192.168.57.11;transport=tcp SIP/2.0\r\nRecord-Route: <sip:172.21.0.131;transport=tcp;lr=on;ftag=KvNj7jXrmK89p>\r\nVia: SIP/2.0/TCP 172.21.0.131;branch=z9hG4bK7c2d.2d8104273b7063309f5694ac963c9ad8.0;i=21 ``` [HEP format description located here](https://github.com/sipcapture/HEP/blob/master/docs/HEP3_Network_Proto…. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 11:01:40 Oct 4 2018 with gcc 6.4.0 ``` * **Operating System**: Docker container Userland ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.1 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` Kernel Amazon Linux 2 ``` / # uname -a Linux proxy-dc0-0 4.14.128-112.105.amzn2.x86_64 #1 SMP Wed Jun 19 16:53:40 UTC 2019 x86_64 Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2092

2 7

[kamailio/kamailio] crypto: SHA1_Init deprecated at openssl 3.0 (PR #3518)
by Victor Seva 27 Jul '23

27 Jul '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #3502 #### Description From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3518 -- Commit Summary -- * crypto: SHA1_Init deprecated at openssl 3.0 -- File Changes -- M src/modules/crypto/crypto_uuid.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3518.patch https://github.com/kamailio/kamailio/pull/3518.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3518 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3518(a)github.com>

2 4

git:master:e55a6ed0: crypto: SHA1_Init deprecated at openssl 3.0
by Victor Seva 27 Jul '23

27 Jul '23

Module: kamailio Branch: master Commit: e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483 URL: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-27T10:02:55+02:00 crypto: SHA1_Init deprecated at openssl 3.0 From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). related to #3502 --- Modified: src/modules/crypto/crypto_uuid.c --- Diff: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… Patch: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… --- diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c index ffe208fb85f..fbc0a3c670d 100644 --- a/src/modules/crypto/crypto_uuid.c +++ b/src/modules/crypto/crypto_uuid.c @@ -177,14 +177,33 @@ static inline int crypto_format_rfc4122_uuid( */ void crypto_generate_callid(str *callid) { +#if OPENSSL_VERSION_NUMBER > 0x030000000L + EVP_MD_CTX *crypto_ctx = NULL; +#else static SHA_CTX crypto_ctx = {0}; +#endif static unsigned char crypto_buf[SHA_DIGEST_LENGTH] = {0}; static char crypto_sbuf[UUID_LEN] = {0}; crypto_inc_counter(crypto_callid_counter, CTR_LEN); + +#if OPENSSL_VERSION_NUMBER > 0x030000000L + if((crypto_ctx = EVP_MD_CTX_new()) == NULL) { + LM_ERR("can't get new context\n"); + callid->s = NULL; + callid->len = 0; + return; + } + EVP_DigestInit_ex(crypto_ctx, EVP_sha1(), NULL); + EVP_DigestUpdate(crypto_ctx, crypto_callid_seed, SEED_LEN); + EVP_DigestUpdate(crypto_ctx, crypto_callid_counter, CTR_LEN); + EVP_DigestFinal_ex(crypto_ctx, crypto_buf, NULL); + EVP_MD_CTX_free(crypto_ctx); +#else SHA1_Init(&crypto_ctx); SHA1_Update(&crypto_ctx, crypto_callid_seed, SEED_LEN); SHA1_Update(&crypto_ctx, crypto_callid_counter, CTR_LEN); SHA1_Final(crypto_buf, &crypto_ctx); +#endif crypto_format_rfc4122_uuid( crypto_sbuf, sizeof(crypto_sbuf), crypto_buf, sizeof(crypto_buf)); callid->s = crypto_sbuf;

1 0

[kamailio/kamailio] failed to find command radius_www_authorize (params 1) (Issue #3525)
by Kachallah Abagana Mahamat 27 Jul '23

27 Jul '23

Hello everyone, I'm trying to authenticate kamailio users using freeradius but I get the following error message when I try to start kamailio: ERROR: <core> [core/cfg.y:3762]: yyparse(): cfg. parser: failed to find command radius_www_authorize (params 1). Thanks for your help. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3525 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3525(a)github.com>

2 2

[kamailio/kamailio] rtpproxy: make sure we null terminate the copy of the string. (PR #3524)
by Maksym Sobolyev 26 Jul '23

26 Jul '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The module has been broken in d00ceda2c04. The code to replace strcpy() did not terminate the target sting with \0. Discovered by our voiptests rig: https://github.com/sippy/voiptests/actions/workflows/kamailio.yml Results in a broken SDP (note garbage around o= attribute: ``` 1681 00:00:08.271/GLOBAL/alice_ua: RECEIVED message from [::1]:5060: 1682 SIP/2.0 183 Session Progress 1683 Via: SIP/2.0/UDP [::1]:5061;received=::1;rport=5061;branch=z9hG4bK20a1169c6781e4bfe26554e84d3b4925 1684 Record-Route: <sip:[::1];ftag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q;lr> 1685 From: "Alice Smith" <sip:alice_2_ipv6@[::1]>;tag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q 1686 To: <sip:bob_2@[::1]>;tag=c77c4b2c8430cf6c18566bc3d9212ed3 1687 Call-ID: O%CciL!Yf0-SQn]G46v4J(SPddRr<MtH(a))<0.ev}(]q.\%X[> 1688 CSeq: 200 INVITE 1689 Content-Type: application/sdp 1690 Content-Length: 296 1691 1692 v=0 1693 o=- 577651195072 577651195072 IN IP6 ::1\x86zU 1694 s=BOBSDP Session 1695 c=IN IP6 ::1\x86zU 1696 t=0 0 1697 m=image 13424 udptl t38 1698 a=T38FaxVersion:0 1699 a=T38MaxBitRate:14400 1700 a=T38FaxRateManagement:transferredTCF 1701 a=T38FaxMaxBuffer:262 1702 a=T38FaxMaxDatagram:176 1703 a=T38FaxUdpEC:t38UDPRedundancy 1704 a=nortpproxy:yes 1740 00:00:08.322/GLOBAL/alice_ua: RECEIVED message from 127.0.0.1:5060: 1741 SIP/2.0 183 Session Progress 1742 v: SIP/2.0/UDP 127.0.0.1:5061;received=127.0.0.1;rport=5061;branch=z9hG4bK8e357573055f35a768af0c9be78c836d 1743 Record-Route: <sip:127.0.0.1;ftag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf;lr> 1744 f: "Alice Smith" <sip:alice_7_ipv4@127.0.0.1>;tag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf 1745 t: <sip:bob_7@127.0.0.1>;tag=8ee80e5205ef358c3cb868fb5e5614f8 1746 i: m6!(QAFQlv}vTlycDH[rpMjW}mVV1phG@z/c{KI:L*n'[`%15 1747 CSeq: 200 INVITE 1748 c: application/sdp 1749 l: 328 1750 1751 v=0 1752 o=- 577651195078 577651195078 IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1753 s=BOBSDP Session 1754 c=IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1755 t=0 0 1756 m=image 13696 udptl t38 1757 a=T38FaxVersion:0 1758 a=T38MaxBitRate:14400 1759 a=T38FaxRateManagement:transferredTCF 1760 a=T38FaxMaxBuffer:262 1761 a=T38FaxMaxDatagram:176 1762 a=T38FaxUdpEC:t38UDPRedundancy 1763 a=nortpproxy:yes ``` Looks like there were multiple changes of the same nature. All of them probably needs to be re-evaluated to make sure this pattern is not propagated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3524 -- Commit Summary -- * rtpproxy: make sure we null terminate the copy of the string. -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3524.patch https://github.com/kamailio/kamailio/pull/3524.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3524 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3524(a)github.com>

2 3

git:master:c2f12479: .clang-format: add json settings [skip ci]
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: c2f12479debe7bd5f5819f3c3b332929dd5fe703 URL: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .clang-format: add json settings [skip ci] --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Patch: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… --- diff --git a/.clang-format b/.clang-format index d805149083d..6f7a705477f 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,7 @@ --- +Language: Json +BasedOnStyle: llvm +--- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -4 @@ -87,4 +90,3 @@ Standard: Cpp11 TabWidth: 4 UseTab: Always ... -

1 0

git:master:bad420e9: .devcontainer: Initial support for devcontainers [skip ci]
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: bad420e9f72c237bbd608a9ff06ae3b63bce9625 URL: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .devcontainer: Initial support for devcontainers [skip ci] Allows to develop inside a container using vscode > https://code.visualstudio.com/docs/devcontainers/containers --- Added: .devcontainer/Dockerfile Added: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Patch: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… --- diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000..50a901b764a --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,17 @@ +FROM mcr.microsoft.com/devcontainers/base:bookworm +# utils packages +RUN apt-get update && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt-get -y install --no-install-recommends \ + apt-utils dialog clang-format clang pbuilder + +# bookworm packaging +RUN mkdir -p /usr/local/src/pkg +COPY bookworm /usr/local/src/pkg/debian + +# get build dependences +RUN cd /usr/local/src/pkg/ && \ + /usr/lib/pbuilder/pbuilder-satisfydepends-experimental + +# clean +RUN apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..98d103801ea --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,34 @@ +{ + /* For format details, see https://aka.ms/devcontainer.json. For config options, see the + * README at: https://github.com/devcontainers/templates/tree/main/src/debian + */ + "name": "Debian", + "build": { + "context": "../pkg/kamailio/deb", + "dockerfile": "Dockerfile" + }, + + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {} + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [ + 5060 + ], + + // Configure tool-specific properties. + "customizations": { + "vscode": { + "settings": {}, + "extensions": [ + "ms-vscode.cpptools-extension-pack", + "xaver.clang-format" + ] + } + }, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + "remoteUser": "root" +}

1 0

[kamailio/kamailio] Initial support for devcontainers (PR #3516)
by Victor Seva 26 Jul '23

26 Jul '23

#### Description Initial support of [devcontainers](https://containers.dev/) Allows to develop inside a container using [vscode](https://code.visualstudio.com/docs/devcontainers/containers) Next steps: * configure github actions to build and publish the image in our github repository https://github.com/devcontainers/ci/blob/main/docs/github-action.md * include configurations for vscode to build and run kamailio * investigate how to debug inside vscode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3516 -- Commit Summary -- * .clang-format: add json settings * .devcontainer: Initial support for devcontainers -- File Changes -- M .clang-format (4) A .devcontainer/Dockerfile (17) A .devcontainer/devcontainer.json (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3516.patch https://github.com/kamailio/kamailio/pull/3516.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3516 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3516(a)github.com>

1 1

git:master:192b681c: sipcapture: make sure we null terminate the copy of the string
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 192b681ce7fcd868a4a47a7c26863c733321b8d4 URL: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:00:38+02:00 sipcapture: make sure we null terminate the copy of the string bug introduced at cbd7810fff3d5145c1ce34c0e362b5590bb92a12 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Patch: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index de0a15174cc..5efb1898036 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2252,7 +2252,8 @@ static int sip_capture( ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; @@ -2839,7 +2840,8 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) /* IP source and destination */ ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port;

1 0

git:master:3c1700fb: rtpproxy: make sure we null terminate the copy of the string.
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 3c1700fb7693c05025be1058e856fe610f4be031 URL: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:55:17+02:00 rtpproxy: make sure we null terminate the copy of the string. bug introduced at d00ceda2c04 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Patch: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 9d7190cabc3..bc252982e1c 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1834,7 +1834,8 @@ static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 0

git:master:2750e48b: rtpproxy: make sure we null terminate the copy of the string.
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 2750e48b5445e9334cb7a062d7d53a1fb9a0a411 URL: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:46:45+02:00 rtpproxy: make sure we null terminate the copy of the string. Broken in d00ceda2c04. --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Patch: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 8103fef4edd..9d7190cabc3 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1698,7 +1698,8 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(ip == NULL) { cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); } if(msg->msg_flags & FL_SDP_BODY)

1 0

[kamailio/kamailio] rtpengine: increase buf size to print mos llint range (PR #3517)
by Stefan Mititelu 20 Jul '23

20 Jul '23

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  CDR avp() mos values gets trimmed at the first larger mos value received. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3517 -- Commit Summary -- * rtpengine: increase buf size to print mos llint range -- File Changes -- M src/modules/rtpengine/rtpengine.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3517.patch https://github.com/kamailio/kamailio/pull/3517.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3517 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3517(a)github.com>

2 3

git:master:8b113985: rtpengine: increase buf size to print mos llint range
by Stefan Mititelu 20 Jul '23

20 Jul '23

Module: kamailio Branch: master Commit: 8b1139851d9f88add1fd7da0dbc0b2b56933cdd3 URL: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-07-20T15:25:37+03:00 rtpengine: increase buf size to print mos llint range --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Patch: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 59bcfb47795..68003908268 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -180,14 +180,15 @@ struct minmax_mos_label_stats }; struct minmax_stats_vals { - long long mos; - long long at; - long long packetloss; - long long jitter; - long long roundtrip; - long long roundtrip_leg; - long long samples; - long long avg_samples; /* our own running count to average the averages */ + long long int mos; + long long int at; + long long int packetloss; + long long int jitter; + long long int roundtrip; + long long int roundtrip_leg; + long long int samples; + long long int + avg_samples; /* our own running count to average the averages */ }; #define RTPE_LIST_VERSION_DELAY 10 @@ -3879,12 +3880,13 @@ static void avp_print_decimal(pv_elem_t *pv, int num, struct sip_msg *msg) len = snprintf(buf, sizeof(buf), "%i.%i", num / 10, abs(num % 10)); avp_print_s(pv, buf, len, msg); } -static void avp_print_int(pv_elem_t *pv, int num, struct sip_msg *msg) +static void avp_print_llint( + pv_elem_t *pv, long long int num, struct sip_msg *msg) { int len; - char buf[8]; + char buf[20]; - len = snprintf(buf, sizeof(buf), "%i", num); + len = snprintf(buf, sizeof(buf), "%lld", num); avp_print_s(pv, buf, len, msg); } static void avp_print_time(pv_elem_t *pv, int num, struct sip_msg *msg) @@ -3904,12 +3906,13 @@ static void avp_print_mos(struct minmax_mos_stats *s, avp_print_decimal(s->mos_pv, vals->mos / vals->avg_samples, msg); avp_print_time(s->at_pv, vals->at - created, msg); - avp_print_int(s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); - avp_print_int(s->jitter_pv, vals->jitter / vals->avg_samples, msg); - avp_print_int(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); - avp_print_int( + avp_print_llint( + s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); + avp_print_llint(s->jitter_pv, vals->jitter / vals->avg_samples, msg); + avp_print_llint(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); + avp_print_llint( s->roundtrip_leg_pv, vals->roundtrip_leg / vals->avg_samples, msg); - avp_print_int(s->samples_pv, vals->samples / vals->avg_samples, msg); + avp_print_llint(s->samples_pv, vals->samples / vals->avg_samples, msg); } static int decode_mos_vals_dict(

1 0

git:5.6:d4d28c09: dialog: set cbs list to NULL after destroying
by Victor Seva 20 Jul '23

20 Jul '23

Module: kamailio Branch: 5.6 Commit: d4d28c098ddc07ab1b956a13878cd8e6f180fe3d URL: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:38:17+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) (cherry picked from commit 20be29ab3638d803341ec376b02edd7c14a9174a) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Patch: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

git:5.7:20be29ab: dialog: set cbs list to NULL after destroying
by Victor Seva 20 Jul '23

20 Jul '23

Module: kamailio Branch: 5.7 Commit: 20be29ab3638d803341ec376b02edd7c14a9174a URL: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:37:12+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… Patch: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

[kamailio/kamailio] dialog: set cbs list to NULL after destroying (PR #3514)
by Stefan Mititelu 19 Jul '23

19 Jul '23

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Make sure dialog cbs list is NULL after is destroyed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3514 -- Commit Summary -- * dialog: set cbs list to NULL after destroying -- File Changes -- M src/modules/dialog/dlg_hash.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3514.patch https://github.com/kamailio/kamailio/pull/3514.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3514 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3514(a)github.com>

2 1

git:master:6881faad: dialog: set cbs list to NULL after destroying
by Victor Seva 19 Jul '23

19 Jul '23

Module: kamailio Branch: master Commit: 6881faadec45dd16dd896b13db44862e7df70422 URL: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T15:04:25+02:00 dialog: set cbs list to NULL after destroying --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… Patch: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 2454940fee3..8e740003c24 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -365,8 +365,11 @@ void destroy_dlg(struct dlg_cell *dlg) if(dlg_db_mode) remove_dialog_from_db(dlg); - if(dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if(dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

Kamailio v5.5.7 Released
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Hello, Kamailio SIP Server v5.5.7 stable release is out. This is a maintenance release of the stable branch 5.5 that includes fixes since the release of v5.5.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.7. Note that 5.5 is now the third last stable branch, v5.5.7 being the last planned released in 5.5.x series. The latest two stable branch are 5.6 and 5.7, with v5.7.1 being released a while ago. For more details about version 5.5.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/07/kamailio-v5-5-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 0

git:master:8a61b460: geoip: reformat static export structures
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: master Commit: 8a61b4607d6d079131bdbfff86c3e28167a12605 URL: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T11:06:11+02:00 geoip: reformat static export structures --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… Patch: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index f95ee001d33..9c953d06d74 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -45,31 +45,38 @@ static void mod_destroy(void); static int w_geoip_match(struct sip_msg *msg, char *str1, char *str2); static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, + {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, pv_parse_geoip_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"geoip_match", (cmd_function)w_geoip_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"geoip_match", (cmd_function)w_geoip_match, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"path", PARAM_STRING, &geoip_path}, {0, 0, 0}}; + {"path", PARAM_STRING, &geoip_path}, + {0, 0, 0} +}; struct module_exports exports = { - "geoip", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "geoip", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:5.5:43eb1344: ChangeLog: content updated for v5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: 43eb13442166e1293b2188aa410173de9f9837fb URL: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T10:01:54+02:00 ChangeLog: content updated for v5.5.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d… Patch: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d…

1 0

git:5.5:1339a180: pkg: version set to 5.5.7 for rpm and alpine specs
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: 1339a180f6d386dfcba655a09d327ba528987acd URL: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T09:56:40+02:00 pkg: version set to 5.5.7 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… Patch: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 462dd82cf14..c3d3e3995b0 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.6 +pkgver=5.5.7 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 27e32dc2bfc..9a19366678c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.6 +%define ver 5.5.7 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:c8b995c0: Makefile.defs: version set to 5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: c8b995c036fe5d15e43138435d3bc68a83747a55 URL: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T09:57:21+02:00 Makefile.defs: version set to 5.5.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… Patch: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5ec3536ea34..d8458f6bfe1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:b9fd39ea: pkg/kamailio/deb: version set 5.5.7
by Victor Seva 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: b9fd39ea259b32fd950080045e0edd0969a9a29d URL: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T09:09:41+02:00 pkg/kamailio/deb: version set 5.5.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Patch: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0…

1 0

Releasing Kamailio v5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Hello, I am planning to release v5.5.7 our of branch 5.5 this week, most likely on Wednesday, July 19, 2023. It will mark the end of official packaging for release series 5.5.x, currently the latest two stable branches are 5.6 and 5.7. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 1

git:master:c35088bf: geoip2: docs - section ids and formatting
by Daniel-Constantin Mierla 18 Jul '23

18 Jul '23

Module: kamailio Branch: master Commit: c35088bf31b3e3e828433bf03b6ce647a75ef8e2 URL: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-18T16:38:20+02:00 geoip2: docs - section ids and formatting --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Patch: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 50a7d855fa8..cbc6ccb1493 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -11,26 +11,25 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> - This module allows real-time queries against the Max Mind GeoIP2 - database to be performed from the config script. + This module allows real-time queries against the Max Mind GeoIP2 + database to be performed from the config script. </para> <para> - The Max Mind GeoIP2 database is a map of IP network address assignments + The Max Mind GeoIP2 database is a map of IP network address assignments to geographical locales that can be useful -- though approximate -- in identifying the physical location with which an IP host address is associated on a relatively granular level. </para> <para> - This database itself can be obtained on a free or commercial basis + This database itself can be obtained on a free or commercial basis from <ulink url="http://dev.maxmind.com/geoip/"> - http://dev.maxmind.com/geoip/</ulink>. The - library libmaxminddb + http://dev.maxmind.com/geoip/</ulink>. The library libmaxminddb that interfaces with the Max Mind API, as well as scripts to automate downloading of the on-disk version are available at <ulink url="http://dev.maxmind.com/geoip/geoip2/downloadable/"> @@ -126,10 +125,10 @@ if(geoip2_match("$si", "src")) { </example> </section> </section> - + <section> <title>Functions</title> - <section> + <section id="geoip.f.geoip2_match"> <title> <function moreinfo="none">geoip2_match(ipaddr, pvc)</function> </title> @@ -149,7 +148,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - <section> + <section id="geoip.f.geoip2_distance"> <title> <function moreinfo="none">geoip2_distance(ip_addr, latitude, longitude)</function> </title> @@ -172,7 +171,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - + </section> <section> @@ -195,13 +194,13 @@ if(geoip2_match("$si", "src")) </example> </section> </section> - - <section> + + <section id="geoip.pvs"> <title>Exported pseudo-variables</title> <itemizedlist> <listitem><para> - <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an - identifier for this query result; it is designated by the second + <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an + identifier for this query result; it is designated by the second parameter of geoip2_match(). The <emphasis>key</emphasis> can be one of the following: </para>

1 0

[kamailio/kamailio] Add 2 new options to dispatcher management in kamctl (PR #3512)
by Nir Simionovich 17 Jul '23

17 Jul '23

kamctl: added new options to dispatcher interface - added a new `rmip` option to delete a specific gateway `ip` in a predefined `setid` - added a new `rmset` option to delete a specific `setid` completely You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3512 -- Commit Summary -- * Add support for deleting a gateway or full setid in dispatcher. * Small style fix to help screen -- File Changes -- M utils/kamctl/kamctl (34) M utils/kamctl/kamctl.base (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3512.patch https://github.com/kamailio/kamailio/pull/3512.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3512 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3512(a)github.com>

2 2

git:master:f68a1e9c: kamctl: add 2 new options to dispatcher management (#3512)
by GitHub 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: f68a1e9c9f249faee38d29776d5831cbf9e3cce7 URL: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… Author: Nir Simionovich <nir.simionovich(a)greenfieldtech.net> Committer: GitHub <noreply(a)github.com> Date: 2023-07-17T17:26:18+02:00 kamctl: add 2 new options to dispatcher management (#3512) *kamctl: add support for deleting a gateway or full setid in dispatcher. * kamctl: small style fix to help screen after previous change --------- Co-authored-by: Nir Simionovich <nirs(a)cloudonix.io> --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… Patch: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 34f6183dfb7..dd09ffb7daf 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1756,6 +1756,40 @@ dispatcher() { fi ;; + rmip) + require_dbengine + shift + if [ $# -ne 2 ] ; then + merr "missing gateway ip address and/or setid to be removed" + exit 1 + fi + + QUERY="delete from $DISPATCHER_TABLE where $DISPATCHER_SETID_COLUMN='$2' and $DISPATCHER_DESTINATION_COLUMN like 'sip:$1:%';" + $DBCMD "$QUERY" + + if [ $? -ne 0 ] ; then + merr "dispatcher - SQL Error" + exit 1 + fi + + ;; + rmset) + require_dbengine + shift + if [ $# -ne 2 ] ; then + merr "missing gateway setid to be removed" + exit 1 + fi + + QUERY="delete from $DISPATCHER_TABLE where $DISPATCHER_SETID_COLUMN='$1'' and $DISPATCHER_DESTINATION_COLUMN like 'sip:$1:%'';" + $DBCMD "$QUERY" + + if [ $? -ne 0 ] ; then + merr "dispatcher - SQL Error" + exit 1 + fi + + ;; reload) require_ctlengine ctl_cmd_run dispatcher.reload diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 9e37f5551fc..a265c479c04 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -512,6 +512,8 @@ cat <<EOF dispatcher add <setid> <destination> [flags] [priority] [attrs] [description] .......................... add gateway dispatcher rm <id> .................. delete gateway + dispatcher rmip <ip> <setid>......... delete gateway <ip> in <setid> + dispatcher rmset <setid> ............. delete all gateways in <setid> EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_dispatcher"

1 0

[kamailio/kamailio] rabbitmq: Adding amqps support (PR #3511)
by joelbax 17 Jul '23

17 Jul '23

Adding support for secure AMQP connections over TLS (amqps).   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3511 -- Commit Summary -- * rabbitmq: Adding amqps support -- File Changes -- M src/modules/rabbitmq/rabbitmq.c (33) M src/modules/rabbitmq/rabbitmq.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3511.patch https://github.com/kamailio/kamailio/pull/3511.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3511 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3511(a)github.com>

4 11

git:master:78c0275b: rabbitmq: Adding amqps support (#3511)
by GitHub 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: 78c0275b9081d4ee18a89f702f3931e3c3f83489 URL: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… Author: joelbax <98022231+joelbax(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2023-07-17T17:21:36+02:00 rabbitmq: Adding amqps support (#3511) * rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). * rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). rabbitmq: Format fixes Some style format fixes * rabbitmq: Format fixes Fixing some missing spaces * rabbitmq: Typo fix Fixing inilialized by initialized --- Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… Patch: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index f1c44ff113b..94341070508 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -52,6 +52,7 @@ #include <stdint.h> #include <amqp_tcp_socket.h> +#include <amqp_ssl_socket.h> #include <amqp.h> #include <amqp_framing.h> @@ -73,10 +74,12 @@ static amqp_connection_state_t amqp_conn = NULL; /* module parameters */ static struct amqp_connection_info amqp_info; static char *amqp_url = RABBITMQ_DEFAULT_AMQP_URL; +static char *rmq_amqps_ca_file = NULL; static int max_reconnect_attempts = 1; static int timeout_sec = 1; static int timeout_usec = 0; static int direct_reply_to = 0; +static int amqp_ssl_init_called = 0; /* module helper functions */ static int rabbitmq_connect(amqp_connection_state_t *conn); @@ -124,6 +127,7 @@ static cmd_export_t cmds[] = { /* module parameters */ static param_export_t params[] = {{"url", PARAM_STRING, &amqp_url}, + {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, {"timeout_sec", PARAM_INT, &timeout_sec}, {"timeout_usec", PARAM_INT, &timeout_usec}, {"direct_reply_to", PARAM_INT, &direct_reply_to}, {0, 0, 0}}; @@ -557,25 +561,52 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) int ret; int log_ret; // amqp_rpc_reply_t reply; + + // amqp_ssl_init_called should only be called once + if(amqp_info.ssl && !amqp_ssl_init_called) { + amqp_set_initialize_ssl_library(1); + amqp_ssl_init_called = 1; + LM_DBG("AMQP SSL library initialized\n"); + } // establish a new connection to RabbitMQ server *conn = amqp_new_connection(); + if(!conn) { + LM_ERR("FAIL: create AMQP connection\n"); + return RABBITMQ_ERR_CREATE; + } log_ret = log_on_amqp_error( amqp_get_rpc_reply(*conn), "amqp_new_connection()"); if(log_ret != AMQP_RESPONSE_NORMAL && log_ret != AMQP_RESPONSE_NONE) { return RABBITMQ_ERR_CONNECT; } - amqp_sock = amqp_tcp_socket_new(*conn); + amqp_sock = (amqp_info.ssl) ? amqp_ssl_socket_new(*conn) + : amqp_tcp_socket_new(*conn); if(!amqp_sock) { LM_ERR("FAIL: create TCP amqp_sock"); amqp_destroy_connection(*conn); return RABBITMQ_ERR_SOCK; } + if(rmq_amqps_ca_file) { + if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { + LM_ERR("Failed to set CA certificate for amqps connection\n"); + return RABBITMQ_ERR_SSL_CACERT; + } + } + +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 + amqp_ssl_socket_set_verify(amqp_sock, 1); +#else + amqp_ssl_socket_set_verify_peer(amqp_sock, 1); + amqp_ssl_socket_set_verify_hostname(amqp_sock, 1); +#endif + ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port); if(ret != AMQP_STATUS_OK) { - LM_ERR("FAIL: open TCP sock, amqp_status=%d", ret); + LM_ERR("FAIL: open %s sock, amqp_status=%d", + (amqp_info.ssl) ? "SSL" : "TCP", ret); // amqp_destroy_connection(*conn); return RABBITMQ_ERR_SOCK; } diff --git a/src/modules/rabbitmq/rabbitmq.h b/src/modules/rabbitmq/rabbitmq.h index 30f39ca7fd5..b37c84674f9 100644 --- a/src/modules/rabbitmq/rabbitmq.h +++ b/src/modules/rabbitmq/rabbitmq.h @@ -49,8 +49,10 @@ typedef enum RABBITMQ_ERR_CHANNEL, RABBITMQ_ERR_QUEUE, RABBITMQ_ERR_PUBLISH, + RABBITMQ_ERR_CREATE, RABBITMQ_ERR_SOCK, RABBITMQ_ERR_CONSUME, + RABBITMQ_ERR_SSL_CACERT, RABBITMQ_ERR_NULL, } RABBITMQ_ENUM;

1 0

git:5.5:aa022e9d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: aa022e9d35f0ce9040d396288f69995d2a7399ac URL: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-17T11:47:06+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995… Patch: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995…

1 0

git:5.5:063bceef: ipops: create container items if not found for srv and naptr functions
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 063bceefc411e2841b7507d9f366a45d62cfbe00 URL: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:17:02+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) (cherry picked from commit 408643ec916bc00f9f9447952e553d129f8ec896) (cherry picked from commit 771fcd42e315376c9d3c16bb63983a72e508be18) --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… Patch: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 6e9d86b5a6a..5151dfd39dc 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -633,7 +633,7 @@ static sr_srv_item_t *_sr_srv_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found; 1 - search only * OUTPUT: srv record pointer; NULL=not found **********/ @@ -1022,9 +1022,9 @@ int srv_update_pv (str *srvcname, str *pvid) LM_DBG ("service name missing: %.*s\n", srvcname->len, srvcname->s); return -2; } - pitem = sr_srv_add_item (pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_srv_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; } @@ -1185,7 +1185,7 @@ static sr_naptr_item_t *_sr_naptr_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found, 1 - search only * OUTPUT: naptr record pointer; NULL=not found **********/ @@ -1491,9 +1491,9 @@ int naptr_update_pv(str *naptrname, str *pvid) LM_DBG ("naptr name missing: %.*s\n", naptrname->len, naptrname->s); return -2; } - pitem = sr_naptr_add_item(pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_naptr_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; }

1 0

git:5.5:edfbecd0: sst: fix condition on sst_min_se for sst_check_min()
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: edfbecd0ed515dab637a03a793c6c2d565dfdaee URL: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:17:12+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) (cherry picked from commit febfc9722f83d992a3c1643fa373468b73cb3fa0) (cherry picked from commit 5fc4cca395e057714376b681bbad4935a9570d0d) --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… Patch: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 55010baaee2..690c03ddfac 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -672,7 +672,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if (sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 0

git:5.5:2555e1b1: tm: enhance documentation for on_sl_reply param
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 2555e1b1a02af8d96504c43953ab395097c86adb URL: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:44+02:00 tm: enhance documentation for on_sl_reply param (cherry picked from commit a4970749b2be40cd598d4ce5cf2eaa6b38fc2307) (cherry picked from commit 2f86215a704ff10a58cb3f5e57497918c381a048) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… Patch: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 247d6ad5e6d..d8f8251818d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -715,7 +715,7 @@ modparam("tm", "reparse_on_dns_failover", 0) </para> <para> If KEMI is used, the parameter has to be the KEMI function name, which - receives a string parameter with the event name. + receives a string parameter with the event name, respectively "on_sl_reply". </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,6 +727,20 @@ modparam("tm", "on_sl_reply", "stateless_replies") onreply_route["stateless_replies"] { # do not allow stateless replies to be forwarded return 0; +} + </programlisting> + </example> + <example> + <title>Set <varname>on_sl_reply</varname> parameter (KEMI javascript)</title> + <programlisting> +... +modparam("tm", "on_sl_reply", "ksr_slreply") +... +-- event callback function implemented in javascript +function ksr_slreply(evname) { + # the evname is set to "on_sl_reply" + # do not allow stateless replies to be forwarded + KSR.x.drop(); } </programlisting> </example>

1 0

git:5.5:a5c798a2: htable: set dbload filed on empty db result
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: a5c798a2292323e235df5423cdc27eea46bddbbf URL: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:53+02:00 htable: set dbload filed on empty db result (cherry picked from commit ba9d663c5d382edef3c98b31aa4341b21c307a34) (cherry picked from commit 27ab4b757805083c231ceb109a46f5501b1baa7c) (cherry picked from commit 249f476403f987917ed7d5c7f6d7ea70e1f43e63) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… Patch: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index cbce085f6c5..f76ea463201 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 0

git:5.5:b1953700: auth_ephemeral: fix authentication with secrets added at runtime (#3390)
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: b1953700ae03bde4c4b4d0c549d09c2f66e8ec09 URL: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2… Author: Dennis <dennis_y(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:23+02:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. (cherry picked from commit 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc) (cherry picked from commit ca13a3382b9067a0dc14fc7ec995ec2d95c8c6cb) --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2… Patch: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2…

1 0

git:5.5:23470fcc: app_lua: fix crash on exausted memory scenario
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 23470fccf6e54d7f853e6df4ab519feb30272721 URL: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:35+02:00 app_lua: fix crash on exausted memory scenario (cherry picked from commit ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6) (cherry picked from commit b524321a4871c349e6ebb464ea018e138bc6d5ed) --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… Patch: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index f736bea98b9..c3d16c98129 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -852,6 +852,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -891,6 +895,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 0

git:5.5:2a5c590a: sqlops: do not allow empty name component in URL
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.5 Commit: 2a5c590ae8e3fb435670d0bd97deda35d22a33ad URL: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:10+02:00 sqlops: do not allow empty name component in URL (cherry picked from commit b15db86e93120824dcfc879099432f3ec1c3b0c7) (cherry picked from commit 9daacc36e3ed858eca97e9b7ac7eaa90e10c0803) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… Patch: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 63c035ca89e..eed82f0a149 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 0

git:5.6:7ee2bfb3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 7ee2bfb30f1119bc8c5b2eddf8f81be77f4804da URL: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-17T11:18:01+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be… Patch: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be…

1 0

git:5.6:771fcd42: ipops: create container items if not found for srv and naptr functions
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 771fcd42e315376c9d3c16bb63983a72e508be18 URL: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:44:34+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) (cherry picked from commit 408643ec916bc00f9f9447952e553d129f8ec896) --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… Patch: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 9ee6f5879a5..444fb084d9e 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -640,7 +640,7 @@ static sr_srv_item_t *_sr_srv_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found; 1 - search only * OUTPUT: srv record pointer; NULL=not found **********/ @@ -1029,9 +1029,9 @@ int srv_update_pv (str *srvcname, str *pvid) LM_DBG ("service name missing: %.*s\n", srvcname->len, srvcname->s); return -2; } - pitem = sr_srv_add_item (pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_srv_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; } @@ -1192,7 +1192,7 @@ static sr_naptr_item_t *_sr_naptr_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found, 1 - search only * OUTPUT: naptr record pointer; NULL=not found **********/ @@ -1498,9 +1498,9 @@ int naptr_update_pv(str *naptrname, str *pvid) LM_DBG ("naptr name missing: %.*s\n", naptrname->len, naptrname->s); return -2; } - pitem = sr_naptr_add_item(pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_naptr_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; }

1 0

git:5.6:5fc4cca3: sst: fix condition on sst_min_se for sst_check_min()
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 5fc4cca395e057714376b681bbad4935a9570d0d URL: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:44:58+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) (cherry picked from commit febfc9722f83d992a3c1643fa373468b73cb3fa0) --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… Patch: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 55010baaee2..690c03ddfac 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -672,7 +672,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if (sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 0

git:5.6:249f4764: htable: set dbload filed on empty db result
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 249f476403f987917ed7d5c7f6d7ea70e1f43e63 URL: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:43:12+02:00 htable: set dbload filed on empty db result (cherry picked from commit ba9d663c5d382edef3c98b31aa4341b21c307a34) (cherry picked from commit 27ab4b757805083c231ceb109a46f5501b1baa7c) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… Patch: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index bbcba99913b..b091113b637 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 0

git:5.6:2f86215a: tm: enhance documentation for on_sl_reply param
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 2f86215a704ff10a58cb3f5e57497918c381a048 URL: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:38:18+02:00 tm: enhance documentation for on_sl_reply param (cherry picked from commit a4970749b2be40cd598d4ce5cf2eaa6b38fc2307) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… Patch: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 3f67ae3f4d9..8c01ab78d0c 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -715,7 +715,7 @@ modparam("tm", "reparse_on_dns_failover", 0) </para> <para> If KEMI is used, the parameter has to be the KEMI function name, which - receives a string parameter with the event name. + receives a string parameter with the event name, respectively "on_sl_reply". </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,6 +727,20 @@ modparam("tm", "on_sl_reply", "stateless_replies") onreply_route["stateless_replies"] { # do not allow stateless replies to be forwarded return 0; +} + </programlisting> + </example> + <example> + <title>Set <varname>on_sl_reply</varname> parameter (KEMI javascript)</title> + <programlisting> +... +modparam("tm", "on_sl_reply", "ksr_slreply") +... +-- event callback function implemented in javascript +function ksr_slreply(evname) { + # the evname is set to "on_sl_reply" + # do not allow stateless replies to be forwarded + KSR.x.drop(); } </programlisting> </example>

1 0

git:5.6:ca13a338: auth_ephemeral: fix authentication with secrets added at runtime (#3390)
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: ca13a3382b9067a0dc14fc7ec995ec2d95c8c6cb URL: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2… Author: Dennis <dennis_y(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:32:33+02:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. (cherry picked from commit 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc) --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2… Patch: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2…

1 0

git:5.6:b524321a: app_lua: fix crash on exausted memory scenario
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: b524321a4871c349e6ebb464ea018e138bc6d5ed URL: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:35:40+02:00 app_lua: fix crash on exausted memory scenario (cherry picked from commit ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6) --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… Patch: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 0a1d13532cc..1010fc5b005 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -912,6 +912,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -951,6 +955,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 0

git:5.6:9daacc36: sqlops: do not allow empty name component in URL
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 9daacc36e3ed858eca97e9b7ac7eaa90e10c0803 URL: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:32:11+02:00 sqlops: do not allow empty name component in URL (cherry picked from commit b15db86e93120824dcfc879099432f3ec1c3b0c7) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… Patch: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 63c035ca89e..eed82f0a149 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 0

git:master:9f3356de: htable: reformat initialized static structures
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: 9f3356de1c769c610112df9dbcfdf6461de9f959 URL: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T08:37:04+02:00 htable: reformat initialized static structures --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64… Patch: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64…

1 0

git:master:15711980: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 157119809f7ce08d568677342d1833ca64a78b01 URL: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-14T17:32:04+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… Patch: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 256689b5782..70319467ca5 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -35,7 +35,7 @@ Henning Westerholt 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -48,7 +48,7 @@ Henning Westerholt 1.1. Set path parameter 1.2. Set resid parameter 1.3. geoip2_match usage - 1.4. distance usage + 1.4. geoip2_distance usage 1.5. geoip2.reload usage Chapter 1. Admin Guide @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -154,7 +154,7 @@ if(geoip2_match("$si", "src")) { 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 4.1. geoip2_match(ipaddr, pvc) @@ -169,19 +169,20 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... -4.2. distance(ip_addr, latitude, longitude) +4.2. geoip2_distance(ip_addr, latitude, longitude) The function calculates the distance in miles between the geocoordinates of the IP address passed as parameter (the coordinates are calculated inside the function) and the geocoordinates latitude and longitude - Example 1.4. distance usage + Example 1.4. geoip2_distance usage ... $var(client_ip) = "109.184.18.64"; $var(lat_pos) = "53.200660"; $var(lon_pos) = "45.004640"; - $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + $var(dist) = geoip2_distance($var(client_ip), $var(lat_pos), $var(lon_po +s)); xlog("distance is $var(dist)\n"); ...

1 0

[kamailio/kamailio] geoip2: added distance function (PR #3506)
by sergey-safarov 14 Jul '23

14 Jul '23

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Added distance function which allows to calculate the distance between the geocoordinates of the the IP-address passed as incoming parameter (coordinates for the IP are determined inside the function) and the geocoordinates passed as parameters for the function. Functions can be used to evaluate the RTPengine server closest to a user. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3506 -- Commit Summary -- * geoip2: added distance function -- File Changes -- M src/modules/geoip2/doc/geoip2_admin.xml (23) M src/modules/geoip2/geoip2_mod.c (154) M src/modules/geoip2/geoip2_pv.c (8) M src/modules/geoip2/geoip2_pv.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3506.patch https://github.com/kamailio/kamailio/pull/3506.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3506 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3506(a)github.com>

2 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev