March 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r12821 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: mrene Date: Fri Mar 27 21:27:20 2009 New Revision: 12821 Log: sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Mar 27 21:27:20 2009 @@ -1375,7 +1375,7 @@ const char *sip_auth_username = NULL; const char *sip_auth_password = NULL; - if ((channel = switch_core_session_get_channel(session))) { + if (session && (channel = switch_core_session_get_channel(session))) { sip_auth_username = switch_channel_get_variable(channel, "sip_auth_username"); sip_auth_password = switch_channel_get_variable(channel, "sip_auth_password"); }

1 0

[Freeswitch-svn] [commit] r12820 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: mikej Date: Fri Mar 27 21:22:02 2009 New Revision: 12820 Log: hrm Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Mar 27 21:22:02 2009 @@ -1375,7 +1375,7 @@ const char *sip_auth_username = NULL; const char *sip_auth_password = NULL; - if ((channel = switch_core_session_get_channel(session)) { + if ((channel = switch_core_session_get_channel(session))) { sip_auth_username = switch_channel_get_variable(channel, "sip_auth_username"); sip_auth_password = switch_channel_get_variable(channel, "sip_auth_password"); }

1 0

[Freeswitch-svn] [commit] r12819 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: mrene Date: Fri Mar 27 21:16:34 2009 New Revision: 12819 Log: doh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Mar 27 21:16:34 2009 @@ -1371,9 +1371,14 @@ int ss_state; sofia_gateway_t *var_gateway = NULL; const char *gw_name = NULL; - switch_channel_t *channel = switch_core_session_get_channel(session); - const char *sip_auth_username = switch_channel_get_variable(channel, "sip_auth_username"); - const char *sip_auth_password = switch_channel_get_variable(channel, "sip_auth_password"); + switch_channel_t *channel = NULL; + const char *sip_auth_username = NULL; + const char *sip_auth_password = NULL; + + if ((channel = switch_core_session_get_channel(session)) { + sip_auth_username = switch_channel_get_variable(channel, "sip_auth_username"); + sip_auth_password = switch_channel_get_variable(channel, "sip_auth_password"); + } if (sofia_private && *sofia_private->auth_gateway_name) { gw_name = sofia_private->auth_gateway_name;

1 0

[Freeswitch-svn] [commit] r12818 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 28 Mar '09

28 Mar '09

Author: mrene Date: Fri Mar 27 20:50:36 2009 New Revision: 12818 Log: Add sip_auth_username and sip_auth_password variables so mod_sofia can answer auth challenges without defining a full gateway Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Mar 27 20:50:36 2009 @@ -1371,6 +1371,9 @@ int ss_state; sofia_gateway_t *var_gateway = NULL; const char *gw_name = NULL; + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *sip_auth_username = switch_channel_get_variable(channel, "sip_auth_username"); + const char *sip_auth_password = switch_channel_get_variable(channel, "sip_auth_password"); if (sofia_private && *sofia_private->auth_gateway_name) { gw_name = sofia_private->auth_gateway_name; @@ -1435,6 +1438,7 @@ } } + if (!(scheme && realm)) { @@ -1442,13 +1446,15 @@ goto end; } - if (!gateway) { + if (sip_auth_username && sip_auth_password) { + switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, sip_auth_username, sip_auth_password); + } else if (gateway) { + switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->auth_username, gateway->register_password); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Matching gateway found\n"); - goto cancel; + goto cancel; } - switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->auth_username, gateway->register_password); - if (profile->debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", profile->username, authentication); } @@ -1457,7 +1463,7 @@ tl_gets(tags, NUTAG_CALLSTATE_REF(ss_state), SIPTAG_WWW_AUTHENTICATE_REF(authenticate), TAG_END()); - nua_authenticate(nh, SIPTAG_EXPIRES_STR(gateway->expires_str), NUTAG_AUTH(authentication), TAG_END()); + nua_authenticate(nh, SIPTAG_EXPIRES_STR(gateway ? gateway->expires_str : "3600"), NUTAG_AUTH(authentication), TAG_END()); goto end;

1 0

[Freeswitch-svn] [commit] r12817 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 18:50:34 2009 New Revision: 12817 Log: remove possible uninitialized memory reference on inherit_codec variable check Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Mar 27 18:50:34 2009 @@ -546,15 +546,18 @@ if (pindex > -1 && caller_channel && switch_channel_ready(caller_channel) && !switch_channel_media_ready(caller_channel)) { const char *var = switch_channel_get_variable(caller_channel, "inherit_codec"); if (switch_true(var)) { - switch_codec_implementation_t impl; + switch_codec_implementation_t impl = { 0 }; char tmp[128] = ""; - switch_core_session_get_read_impl(originate_status[pindex].peer_session, &impl); - switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); - switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp); - + if (switch_core_session_get_read_impl(originate_status[pindex].peer_session, &impl) == SWITCH_STATUS_SUCCESS) { + switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); + switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error inheriting codec. Channel %s has no read codec yet.\n", + switch_channel_get_name(originate_status[pindex].peer_channel)); + } } }

1 0

[Freeswitch-svn] [commit] r12816 - freeswitch/trunk/scripts/contrib/swk/php/amfphp
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: silik0n Date: Fri Mar 27 18:37:52 2009 New Revision: 12816 Log: and new the cli domain/user generator... gen_users.php <domain_name> <start_exten> <stop_exten> <sip_pass> Added: freeswitch/trunk/scripts/contrib/swk/php/amfphp/gen_users.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Fri Mar 27 18:37:52 2009 @@ -306,7 +306,7 @@ public function addDirDomainVar($domains_uid, $name, $value) { $dbh = $this->getDbh(); $query = sprintf('insert into domain_variables (domains_uid, name, value) values (%s, "%s", "%s")', $domains_uid, $name, $value); - $dbh->exec($query); + return $dbh->exec($query); } public function updateDirDomainParam($param_uid, $name, $value) { @@ -365,7 +365,7 @@ public function addDirDomainUser($domains_uid, $username, $mailbox, $cidr, $enabled) { $dbh = $this->getDbh(); $query = sprintf('insert into users (domains_uid, username, mailbox, cidr, enabled) values (%s, "%s", "%s", "%s", %s)', - $domain_uid, $username, $mailbox, $cidr, $enabled); + $domains_uid, $username, $mailbox, $cidr, $enabled); return $dbh->exec($query); } @@ -378,7 +378,7 @@ public function addDirDomainUserVar($users_uid, $name, $value) { $dbh = $this->getDbh(); $query = sprintf('insert into user_variables (users_uid, name, value) values (%s, "%s", "%s")', $users_uid, $name, $value); - $dbh->exec($query); + return $dbh->exec($query); } public function updateDirDomainUserParam($param_uid, $name, $value) { Added: freeswitch/trunk/scripts/contrib/swk/php/amfphp/gen_users.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/gen_users.php Fri Mar 27 18:37:52 2009 @@ -0,0 +1,106 @@ +<? +/* Simple Script to generate a Domain and a group of users */ + +if($argv[1] == "-h" || $argv[1] == "-help" || $argv[1] == "-?"){ + printf("%s <domain_name> <start_exten> <stop_exten> <sip_pass>\n", $argv[0]); + printf("Example: %s domain.com 1000 1019 1234\n", $argv[0]); + die(); +} + +$domain_name = $argv[1]; +$start = $argv[2]; +$stop = $argv[3]; +$sip_pass = $argv[4]; + +require_once("freeswitch.php"); + +$domains_params_insert = array(array('dial-string','{presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(\${dialed_user}@\${dialed_domain})}')); + +$domains_vars_insert = array( array('record_stereo','true'), + array('default_gateway','\$\${default_provider}'), + array('default_areacode','\$\${default_areacode}'), + array('transfer_fallback_extension','operator')); + +$user_default_vars = array( array("numbering_plan", "\$\${default_country}"), + array("default_areacode", "\$\${default_areacode}"), + array("default_gateway", "\$\${default_provider}")); + +$user_params_insert = array( array('password',$sip_pass), + array('vm-password','%s')); + +$user_vars_insert = array( array('toll_allow','domestic,international,local'), + array('accountcode','%s'), + array('user_context','default'), + array('effective_caller_id_name','Extension %s'), + array('effective_caller_id_number','%s'), + array('outbound_caller_id_name','\$\${outbound_caller_name}'), + array('outbound_caller_id_number','\$\${outbound_caller_id}'), + array('callgroup','techsupport')); + + +$fsc = new FreeSWITCH(); + +if ($fsc->addDirDomain($domain_name) < 1){ + die("add domain failed\n"); +} + +$db_domain = $fsc->getDirDomainbyName($domain_name); + +foreach($domains_params_insert as $param){ + if ($fsc->addDirDomainParam($db_domain['uid'], $param[0], $param[1]) < 1){ + die("Add Domain Param Failed\n"); + } +} + +foreach($domains_vars_insert as $vars){ + if ($fsc->addDirDomainVar($db_domain['uid'], $vars[0], $vars[1]) < 1 ){ + die("Add Domain Var Failed\n"); + } +} + +if ($fsc->addDirDomainUser($db_domain['uid'], "default", "", "", 1) < 1) { + die("add default user failed\n"); +} + +$db_user = $fsc->getDirUsersByDomainUidByUsername($db_domain['uid'], "default"); + +foreach($user_default_vars as $vars){ + if (preg_match('/%s/', $vars[1])) { + $temp = $vars[1]; + $vars[1] = sprintf($temp, "default"); + } + if ($fsc->addDirDomainUserVar($db_user['uid'], $vars[0], $vars[1]) < 1 ) { + die("Add Default User Var Failed\n"); + } +} + +for ($i = $start; $i <= $stop; $i++) { + + if ($fsc->addDirDomainUser($db_domain['uid'], $i, $i, "", 1) < 1) { + die("add user failed\n"); + } + + $db_user = $fsc->getDirUsersByDomainUidByUsername($db_domain['uid'], $i); + + foreach($user_params_insert as $param){ + if (preg_match('/%s/', $param[1])) { + $temp = $param[1]; + $param[1] = sprintf($temp, $i); + } + if ($fsc->addDirDomainUserParam($db_user['uid'], $param[0], $param[1]) < 1){ + die("Add User Param Failed\n"); + } + } + + foreach($user_vars_insert as $vars){ + if (preg_match('/%s/', $vars[1])) { + $temp = $vars[1]; + $vars[1] = sprintf($temp, $i); + } + if ($fsc->addDirDomainUserVar($db_user['uid'], $vars[0], $vars[1]) < 1 ) { + die("Add User Var Failed\n"); + } + } +} + +?>

1 0

[Freeswitch-svn] [commit] r12815 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 17:45:17 2009 New Revision: 12815 Log: don't auto-disable, just warn Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Mar 27 17:45:17 2009 @@ -993,8 +993,7 @@ switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY: if (tech_pvt->rtp_session && switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot pass 2833 on a transcoded call.\n"); - switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Pass 2833 mode may not work on a transcoded call.\n"); } goto end;

1 0

[Freeswitch-svn] [commit] r12814 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 16:53:51 2009 New Revision: 12814 Log: convert Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Fri Mar 27 16:53:51 2009 @@ -1057,11 +1057,9 @@ , m_readRTP(0, 512) , m_callOnStart(true) { - - m_readFrame = (switch_frame_t *) switch_core_session_alloc(m_fsSession, sizeof(*m_readFrame)); - - m_readFrame->codec = m_switchCodec; - m_readFrame->flags = SFF_RAW_RTP; + memset(&m_readFrame, 0, sizeof(m_readFrame)); + m_readFrame.codec = m_switchCodec; + m_readFrame.flags = SFF_RAW_RTP; } @@ -1118,7 +1116,7 @@ << mediaFormat.GetMediaType() << " codec " << mediaFormat << " for connection " << *this); if (IsSink()) { - m_readFrame->rate = mediaFormat.GetClockRate(); + m_readFrame.rate = mediaFormat.GetClockRate(); if (isAudio) { switch_core_session_set_read_codec(m_fsSession, m_switchCodec); @@ -1197,7 +1195,7 @@ m_callOnStart = false; } - m_readFrame->flags = 0; + m_readFrame.flags = 0; /* while (switch_channel_ready(m_fsChannel)) { @@ -1224,7 +1222,7 @@ return SWITCH_STATUS_FALSE; } if (!m_readRTP.GetPayloadSize()) { - m_readFrame->flags = SFF_CNG; + m_readFrame.flags = SFF_CNG; break; } } @@ -1236,8 +1234,8 @@ switch_core_timer_next(m_switchTimer); - if (!(m_readFrame->datalen = m_readRTP.GetPayloadSize())) { - m_readFrame->flags = SFF_CNG; + if (!(m_readFrame.datalen = m_readRTP.GetPayloadSize())) { + m_readFrame.flags = SFF_CNG; } } @@ -1247,17 +1245,17 @@ //switch_core_timer_step(&m_switchTimer); - m_readFrame->buflen = m_readRTP.GetSize(); - m_readFrame->data = m_readRTP.GetPayloadPtr(); - m_readFrame->packet = m_readRTP.GetPointer(); - m_readFrame->packetlen = m_readRTP.GetHeaderSize() + m_readFrame->datalen; - m_readFrame->payload = (switch_payload_t) m_readRTP.GetPayloadType(); - m_readFrame->timestamp = m_readRTP.GetTimestamp(); - m_readFrame->m = (switch_bool_t) m_readRTP.GetMarker(); - m_readFrame->seq = m_readRTP.GetSequenceNumber(); - m_readFrame->ssrc = m_readRTP.GetSyncSource(); - m_readFrame->codec = m_switchCodec; - *frame = m_readFrame; + m_readFrame.buflen = m_readRTP.GetSize(); + m_readFrame.data = m_readRTP.GetPayloadPtr(); + m_readFrame.packet = m_readRTP.GetPointer(); + m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen; + m_readFrame.payload = (switch_payload_t) m_readRTP.GetPayloadType(); + m_readFrame.timestamp = m_readRTP.GetTimestamp(); + m_readFrame.m = (switch_bool_t) m_readRTP.GetMarker(); + m_readFrame.seq = m_readRTP.GetSequenceNumber(); + m_readFrame.ssrc = m_readRTP.GetSyncSource(); + m_readFrame.codec = m_switchCodec; + *frame = &m_readFrame; return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Fri Mar 27 16:53:51 2009 @@ -234,7 +234,7 @@ switch_channel_t *m_fsChannel; switch_timer_t *m_switchTimer; switch_codec_t *m_switchCodec; - switch_frame_t *m_readFrame; + switch_frame_t m_readFrame; RTP_DataFrame m_readRTP; bool m_callOnStart; uint32_t m_timeStamp;

1 0

[Freeswitch-svn] [commit] r12813 - freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: rupa Date: Fri Mar 27 15:11:21 2009 New Revision: 12813 Log: update sample DDL Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/mysql-5.0.sql freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/postgres-8.3.sql Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/mysql-5.0.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/mysql-5.0.sql (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/mysql-5.0.sql Fri Mar 27 15:11:21 2009 @@ -34,6 +34,7 @@ `date_end` datetime NOT NULL DEFAULT '2030-12-31', `quality` float(10,6) NOT NULL, `reliability` float(10,6) NOT NULL, + `cid` varchar(32), NOT NULL DEFAULT '', `enabled` boolean NOT NULL DEFAULT '1', PRIMARY KEY (`id`), KEY `carrier_id` (`carrier_id`), Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/postgres-8.3.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/postgres-8.3.sql (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/sql/postgres-8.3.sql Fri Mar 27 15:11:21 2009 @@ -53,6 +53,7 @@ date_end timestamp with time zone NOT NULL DEFAULT '2030-12-31', quality numeric(10,6) NOT NULL DEFAULT 0, reliability numeric(10,6) NOT NULL DEFAULT 0, + cid VARCHAR(32) NOT NULL DEFAULT '', enabled boolean NOT NULL DEFAULT 'true', CONSTRAINT lcr_pkey PRIMARY KEY (id) );

1 0

[Freeswitch-svn] [commit] r12812 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: rupa Date: Fri Mar 27 15:01:54 2009 New Revision: 12812 Log: remove WTF Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Mar 27 15:01:54 2009 @@ -34,7 +34,7 @@ #include <switch_odbc.h> -#define LCR_SYNTAX "lcr <digits> [<lcr profile>]" +#define LCR_SYNTAX "lcr <digits> [<lcr profile>] [caller_id]" #define LCR_ADMIN_SYNTAX "lcr_admin show profiles" /* SQL Query places */ @@ -48,17 +48,28 @@ #define LCR_PREFIX_PLACE 7 #define LCR_SUFFIX_PLACE 8 #define LCR_CODEC_PLACE 9 +#define LCR_CID_PLACE 10 #define LCR_QUERY_COLS_REQUIRED 9 -#define LCR_QUERY_COLS 10 +#define LCR_QUERY_COLS 11 -#define LCR_DIALSTRING_PLACE 3 -#define LCR_HEADERS_COUNT 4 +#define LCR_HEADERS_COUNT 6 + +#define LCR_HEADERS_DIGITS 0 +#define LCR_HEADERS_CARRIER 1 +#define LCR_HEADERS_RATE 2 +#define LCR_HEADERS_DIALSTRING 3 +#define LCR_HEADERS_CODEC 4 +#define LCR_HEADERS_CID 5 + +#define LCR_ char headers[LCR_HEADERS_COUNT][32] = { "Digit Match", "Carrier", "Rate", "Dialstring", + "Codec", + "CID Regexp" }; /* sql for random function */ @@ -87,6 +98,7 @@ size_t tstrip; size_t digit_len; char *codec; + char *cid; struct lcr_obj *prev; struct lcr_obj *next; }; @@ -95,6 +107,8 @@ size_t carrier_name; size_t digit_str; size_t rate; + size_t codec; + size_t cid; size_t dialstring; }; @@ -127,6 +141,7 @@ int matches; switch_memory_pool_t *pool; char *lookup_number; + char *cid; profile_t *profile; switch_core_session_t *session; switch_event_t *event; @@ -150,7 +165,64 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown); SWITCH_MODULE_DEFINITION(mod_lcr, mod_lcr_load, mod_lcr_shutdown, NULL); -static char *get_bridge_data(switch_memory_pool_t *pool, const char *dialed_number, lcr_route cur_route) +static const char *do_cid(switch_memory_pool_t *pool, const char *cid, const char *number) +{ + switch_regex_t *re = NULL; + int proceed = 0, ovector[30]; + char *substituted = NULL; + uint32_t len = 0; + char *src = NULL; + char *dst = NULL; + + if (!switch_strlen_zero(cid)) { + len = strlen(cid); + } else { + goto done; + } + + src = switch_core_strdup(pool, cid); + /* check that this is a valid regexp and split the string */ + + if ((src[0] == '/') && src[len-1] == '/') { + /* strip leading / trailing slashes */ + src[len-1] = '\0'; + src++; + + /* break on first / */ + dst = strchr(src, '/'); + *dst = '\0'; + dst++; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "src: %s, dst: %s\n", src, dst); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not a valid regexp: %s\n", src); + goto done; + } + + switch_assert(src != NULL); + switch_assert(dst != NULL); + + if ((proceed = switch_regex_perform(number, src, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { + len = (uint32_t) (strlen(src) + strlen(dst) + 10) * proceed; /* guestimate size */ + if (!(substituted = switch_core_alloc(pool, len))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + goto done; + } + memset(substituted, 0, len); + switch_perform_substitution(re, proceed, dst, number, substituted, len, ovector); + } else { + goto done; + } + + switch_regex_safe_free(re); + + return substituted; + +done: + switch_regex_safe_free(re); + return number; +} + +static char *get_bridge_data(switch_memory_pool_t *pool, char *dialed_number, char *caller_id, lcr_route cur_route) { size_t lstrip; size_t tstrip; @@ -158,6 +230,7 @@ char *destination_number = NULL; char *orig_destination_number = NULL; char *codec = NULL; + char *cid = NULL; orig_destination_number = destination_number = switch_core_strdup(pool, dialed_number); @@ -176,9 +249,15 @@ codec = switch_core_sprintf(pool, ",absolute_codec_string=%s", cur_route->codec); } - data = switch_core_sprintf(pool, "[lcr_carrier=%s,lcr_rate=%s%s]%s%s%s%s%s" + cid = ""; + if (!switch_strlen_zero(cur_route->cid)) { + cid = switch_core_sprintf(pool, ",effective_caller_id_number=%s", + do_cid(pool, cur_route->cid, caller_id)); + } + + data = switch_core_sprintf(pool, "[lcr_carrier=%s,lcr_rate=%s%s%s]%s%s%s%s%s" , cur_route->carrier_name, cur_route->rate_str - , codec + , codec, cid , cur_route->gw_prefix, cur_route->prefix , destination_number, cur_route->suffix, cur_route->gw_suffix); @@ -202,11 +281,12 @@ void init_max_lens(max_len maxes) { - maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); - maxes->carrier_name = (headers[LCR_CARRIER_PLACE] == NULL ? 0 : strlen(headers[LCR_CARRIER_PLACE])); - maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); - maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); + maxes->digit_str = (headers[LCR_HEADERS_DIGITS] == NULL ? 0 : strlen(headers[LCR_HEADERS_DIGITS])); + maxes->carrier_name = (headers[LCR_HEADERS_CARRIER] == NULL ? 0 : strlen(headers[LCR_HEADERS_CARRIER])); + maxes->dialstring = (headers[LCR_HEADERS_DIALSTRING] == NULL ? 0 : strlen(headers[LCR_HEADERS_DIALSTRING])); maxes->rate = 8; + maxes->codec = (headers[LCR_HEADERS_CODEC] == NULL ? 0 : strlen(headers[LCR_HEADERS_CODEC])); + maxes->cid = (headers[LCR_HEADERS_CID] == NULL ? 0 : strlen(headers[LCR_HEADERS_CID])); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) @@ -250,6 +330,18 @@ maxes->rate = this_len; } } + if (current->codec != NULL) { + this_len= strlen(current->codec); + if (this_len > maxes->codec) { + maxes->codec = this_len; + } + } + if (current->cid != NULL) { + this_len = strlen(current->cid); + if (this_len > maxes->cid) { + maxes->cid = this_len; + } + } } return SWITCH_STATUS_SUCCESS; } @@ -445,7 +537,10 @@ if (argc > LCR_CODEC_PLACE) { additional->codec = switch_core_strdup(pool, switch_str_nil(argv[LCR_CODEC_PLACE])); } - additional->dialstring = get_bridge_data(pool, cbt->lookup_number, additional); + if (argc > LCR_CID_PLACE) { + additional->cid = switch_core_strdup(pool, switch_str_nil(argv[LCR_CID_PLACE])); + } + additional->dialstring = get_bridge_data(pool, cbt->lookup_number, cbt->cid, additional); if (cbt->head == NULL) { key = switch_core_sprintf(pool, "%s:%s", additional->gw_prefix, additional->gw_suffix); @@ -518,9 +613,10 @@ return SWITCH_STATUS_SUCCESS; } -switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits) +switch_status_t lcr_do_lookup(callback_t *cb_struct) { switch_stream_handle_t sql_stream = { 0 }; + char *digits = cb_struct->lookup_number; char *digits_copy; char *digits_expanded; profile_t *profile = cb_struct->profile; @@ -528,6 +624,9 @@ switch_channel_t *channel; char *id_str; char *safe_sql; + + switch_assert(cb_struct->cid != NULL); + switch_assert(cb_struct->lookup_number != NULL); digits_copy = string_digitsonly(cb_struct->pool, digits); if (switch_strlen_zero(digits_copy)) { @@ -606,7 +705,8 @@ } routes.lookup_number = "15555551212"; - return (lcr_do_lookup(&routes, routes.lookup_number) == SWITCH_STATUS_SUCCESS) ? + routes.cid = "18005551212"; + return (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) ? SWITCH_TRUE : SWITCH_FALSE; } @@ -770,7 +870,13 @@ sql_stream.write_function(&sql_stream, ", cg.codec "); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "codec field defined.\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "codec field not defined, please update your lcr database schema.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "codec field not defined, please update your lcr carrier_gateway database schema.\n"); + } + if (db_check("SELECT cid from lcr limit 1") == SWITCH_TRUE) { + sql_stream.write_function(&sql_stream, ", l.cid "); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cid field defined.\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "cid field not defined, please update your lcr database schema.\n"); } sql_stream.write_function(&sql_stream, "FROM lcr l JOIN carriers c ON l.carrier_id=c.id JOIN carrier_gateway cg ON c.id=cg.carrier_id WHERE c.enabled = '1' AND cg.enabled = '1' AND l.enabled = '1' AND digits IN ("); sql_stream.write_function(&sql_stream, "${lcr_query_expanded_digits}"); @@ -874,7 +980,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s\n", caller_profile->destination_number); routes.lookup_number = caller_profile->destination_number; - if (lcr_do_lookup(&routes, caller_profile->destination_number) == SWITCH_STATUS_SUCCESS) { + routes.cid = (char *) caller_profile->caller_id_number; + if (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) { if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, caller_profile->destination_number)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); goto end; @@ -954,7 +1061,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile); goto end; } - if (lcr_do_lookup(&routes, dest) == SWITCH_STATUS_SUCCESS) { + if (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) { for (cur_route = routes.head; cur_route; cur_route = cur_route->next) { switch_snprintf(vbuf, sizeof(vbuf), "lcr_route_%d", cnt++); switch_channel_set_variable(channel, vbuf, cur_route->dialstring); @@ -986,7 +1093,6 @@ int argc; char *mydata = NULL; char *dialstring = NULL; - char *destination_number = NULL; char *lcr_profile = NULL; lcr_route current = NULL; max_obj_t maximum_lengths = { 0 }; @@ -1013,11 +1119,18 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { switch_assert(argv[0] != NULL); - destination_number = switch_core_strdup(pool, argv[0]); + cb_struct.lookup_number = switch_core_strdup(pool, argv[0]); if (argc > 1) { lcr_profile = argv[1]; } - cb_struct.lookup_number = destination_number; + if (argc > 2) { + cb_struct.cid = switch_core_strdup(pool, argv[2]); + } else { + cb_struct.cid = "18005551212"; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING + , "Using default CID [%s]\n", cb_struct.cid + ); + } if (!(cb_struct.profile = locate_profile(lcr_profile))) { stream->write_function(stream, "-ERR Unknown profile: %s\n", lcr_profile); goto end; @@ -1026,7 +1139,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO , "data passed to lcr is [%s]\n", cmd ); - lookup_status = lcr_do_lookup(&cb_struct, destination_number); + lookup_status = lcr_do_lookup(&cb_struct); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO , "lcr lookup returned [%d]\n" , lookup_status @@ -1034,25 +1147,35 @@ if (cb_struct.head != NULL) { size_t len; - process_max_lengths(&maximum_lengths, cb_struct.head, destination_number); + process_max_lengths(&maximum_lengths, cb_struct.head, cb_struct.lookup_number); + + stream->write_function(stream, " | %s", headers[LCR_HEADERS_DIGITS]); + if ((len = (maximum_lengths.digit_str - strlen(headers[LCR_HEADERS_DIGITS]))) > 0) { + str_repeat(len, " ", stream); + } + + stream->write_function(stream, " | %s", headers[LCR_HEADERS_CARRIER]); + if ((len = (maximum_lengths.carrier_name - strlen(headers[LCR_HEADERS_CARRIER]))) > 0) { + str_repeat(len, " ", stream); + } - stream->write_function(stream, " | %s", headers[LCR_DIGITS_PLACE]); - if ((len = (maximum_lengths.digit_str - strlen(headers[LCR_DIGITS_PLACE]))) > 0) { + stream->write_function(stream, " | %s", headers[LCR_HEADERS_RATE]); + if ((len = (maximum_lengths.rate - strlen(headers[LCR_HEADERS_RATE]))) > 0) { str_repeat(len, " ", stream); } - stream->write_function(stream, " | %s", headers[LCR_CARRIER_PLACE]); - if ((len = (maximum_lengths.carrier_name - strlen(headers[LCR_CARRIER_PLACE]))) > 0) { + stream->write_function(stream, " | %s", headers[LCR_HEADERS_CODEC]); + if ((len = (maximum_lengths.codec - strlen(headers[LCR_HEADERS_CODEC]))) > 0) { str_repeat(len, " ", stream); } - stream->write_function(stream, " | %s", headers[LCR_RATE_PLACE]); - if ((len = (maximum_lengths.rate - strlen(headers[LCR_RATE_PLACE]))) > 0) { + stream->write_function(stream, " | %s", headers[LCR_HEADERS_CID]); + if ((len = (maximum_lengths.cid - strlen(headers[LCR_HEADERS_CID]))) > 0) { str_repeat(len, " ", stream); } - stream->write_function(stream, " | %s", headers[LCR_DIALSTRING_PLACE]); - if ((len = (maximum_lengths.dialstring - strlen(headers[LCR_DIALSTRING_PLACE]))) > 0) { + stream->write_function(stream, " | %s", headers[LCR_HEADERS_DIALSTRING]); + if ((len = (maximum_lengths.dialstring - strlen(headers[LCR_HEADERS_DIALSTRING]))) > 0) { str_repeat(len, " ", stream); } @@ -1061,7 +1184,7 @@ current = cb_struct.head; while (current) { - dialstring = get_bridge_data(pool, destination_number, current); + dialstring = get_bridge_data(pool, cb_struct.lookup_number, cb_struct.cid, current); stream->write_function(stream, " | %s", current->digit_str); str_repeat((maximum_lengths.digit_str - current->digit_len), " ", stream); @@ -1071,7 +1194,23 @@ stream->write_function(stream, " | %s", current->rate_str ); str_repeat((maximum_lengths.rate - strlen(current->rate_str)), " ", stream); - + + if (current->codec) { + stream->write_function(stream, " | %s", current->codec ); + str_repeat((maximum_lengths.codec - strlen(current->codec)), " ", stream); + } else { + stream->write_function(stream, " | "); + str_repeat((maximum_lengths.codec), " ", stream); + } + + if (current->cid) { + stream->write_function(stream, " | %s", current->cid ); + str_repeat((maximum_lengths.cid - strlen(current->cid)), " ", stream); + } else { + stream->write_function(stream, " | "); + str_repeat((maximum_lengths.cid), " ", stream); + } + stream->write_function(stream, " | %s", dialstring); str_repeat((maximum_lengths.dialstring - strlen(dialstring)), " ", stream);

1 0