May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8725 - in freeswitch/trunk: conf/autoload_configs src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:35:58 2008 New Revision: 8725 Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: legs option to cdr_csv Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Thu May 29 17:35:58 2008 @@ -6,6 +6,8 @@   <param name="rotate-on-hup" value="true"/> +  + <param name="legs" value="a"/> </settings> <templates> <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:35:58 2008 @@ -29,6 +29,11 @@ #include <sys/stat.h> #include <switch.h> +typedef enum { + CDR_LEG_A = (1 << 0), + CDR_LEG_B = (1 << 1) +} cdr_leg_t; + struct cdr_fd { int fd; char *path; @@ -50,6 +55,7 @@ int shutdown; int rotate; int debug; + cdr_leg_t legs; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_csv_load); @@ -166,8 +172,16 @@ const char *log_dir = NULL, *accountcode = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; - if (switch_channel_get_originator_caller_profile(channel)) { - return SWITCH_STATUS_SUCCESS; + if (!((globals.legs && CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { + if ((globals.legs && CDR_LEG_A)) { + if (switch_channel_get_originator_caller_profile(channel)) { + return SWITCH_STATUS_SUCCESS; + } + } else { + if (switch_channel_get_originatee_caller_profile(channel)) { + return SWITCH_STATUS_SUCCESS; + } + } } if (!(log_dir = switch_channel_get_variable(channel, "cdr_csv_base"))) { @@ -278,10 +292,11 @@ switch_core_hash_init(&globals.template_hash, pool); globals.pool = pool; - + switch_core_hash_insert(globals.template_hash, "default", default_template); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding default template.\n"); - + globals.legs = CDR_LEG_A; + if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { if ((settings = switch_xml_child(cfg, "settings"))) { @@ -290,6 +305,16 @@ char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "debug")) { globals.debug = switch_true(val); + } else if (!strcasecmp(var, "legs")) { + globals.legs = 0; + + if (strchr(val, 'a')) { + globals.legs |= CDR_LEG_A; + } + + if (strchr(val, 'a')) { + globals.legs |= CDR_LEG_B; + } } else if (!strcasecmp(var, "log-base")) { globals.log_dir = switch_core_sprintf(pool, "%s%scdr-csv", val, SWITCH_PATH_SEPARATOR); } else if (!strcasecmp(var, "rotate-on-hup")) {

1 0

[commit] r8724 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 16:25:58 2008 New Revision: 8724 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add presence events to proxy mode Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 29 16:25:58 2008 @@ -1923,6 +1923,18 @@ msg.from = __FILE__; msg.string_arg = (char *) r_sdp; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp); + + if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + if (!switch_stristr("sendonly", r_sdp)) { + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); + } + } else if (switch_stristr("sendonly", r_sdp)) { + switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + switch_channel_presence(tech_pvt->channel, "unknown", "hold"); + } + + if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n"); nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END()); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu May 29 16:25:58 2008 @@ -706,7 +706,7 @@ } } } - printf("WTF [%s] %d\n", new_uri, uri_only); + return new_uri; }

1 0

[commit] r8723 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: mikej Date: Thu May 29 16:02:06 2008 New Revision: 8723 Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add enable-3pcc sofia profile param, it is now disabled by default. Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Thu May 29 16:02:06 2008 @@ -37,5 +37,6 @@ <param name="ext-sip-ip" value="$${external_sip_ip}"/> <param name="rtp-timeout-sec" value="300"/> <param name="rtp-hold-timeout-sec" value="1800"/> +  </settings> </profile> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu May 29 16:02:06 2008 @@ -118,6 +118,8 @@    +  + </settings> </profile> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Thu May 29 16:02:06 2008 @@ -28,5 +28,6 @@ <param name="ext-sip-ip" value="$${external_sip_ip}"/> <param name="rtp-timeout-sec" value="300"/> <param name="rtp-hold-timeout-sec" value="1800"/> +  </settings> </profile> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu May 29 16:02:06 2008 @@ -147,7 +147,8 @@ PFLAG_DISABLE_TIMER = (1 << 19), PFLAG_DISABLE_100REL = (1 << 20), PFLAG_AGGRESSIVE_NAT_DETECTION = (1 << 21), - PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22) + PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22), + PFLAG_3PCC = (1 << 23) } PFLAGS; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 29 16:02:06 2008 @@ -1244,6 +1244,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_REG; } + } else if (!strcasecmp(var, "enable-3pcc")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_3PCC; + } } else if (!strcasecmp(var, "accept-blind-auth")) { if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_AUTH; @@ -1877,15 +1881,20 @@ if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { goto done; } else { - switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); - sofia_glue_tech_choose_port(tech_pvt, 0); - sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); - switch_channel_set_state(channel, CS_HIBERNATE); - nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->profile->url), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + if (profile->pflags & PFLAG_3PCC) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); + sofia_glue_tech_choose_port(tech_pvt, 0); + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); + switch_channel_set_state(channel, CS_HIBERNATE); + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + } else { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "3PCC DISABLED"); + switch_channel_hangup(channel, SWITCH_CAUSE_MANDATORY_IE_MISSING); + } goto done; } }

1 0

[commit] r8722 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 15:05:48 2008 New Revision: 8722 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: hangup properly on malformed 3pcc calls being bastardized into a way to ping Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu May 29 15:05:48 2008 @@ -2056,7 +2056,9 @@ break; case nua_callstate_terminating: if (session) { - if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { + if (status == 488 || switch_channel_get_state(channel) == CS_HIBERNATE) { + tech_pvt->q850_cause = SWITCH_CAUSE_MANDATORY_IE_MISSING; + } else if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); } }

1 0

[commit] r8721 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 13:35:16 2008 New Revision: 8721 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix uri bug which will never end cos text based signalling is lame Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu May 29 13:35:16 2008 @@ -697,12 +697,16 @@ } } else { if (params) { - new_uri = switch_core_session_sprintf(session, "%s;%s", stripped, params); + new_uri = switch_core_session_sprintf(session, "%s%s;%s%s", uri_only ? "" : "<", stripped, params, uri_only ? "" : ">"); } else { - new_uri = stripped; + if (uri_only) { + new_uri = stripped; + } else { + new_uri = switch_core_session_sprintf(session, "<%s>", stripped); + } } } - + printf("WTF [%s] %d\n", new_uri, uri_only); return new_uri; } @@ -1040,7 +1044,7 @@ url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); - from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE, NULL); + from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, NULL); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_params); @@ -1050,7 +1054,7 @@ */ use_from_str = from_str; from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); - + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url_str), SIPTAG_TO_STR(to_str), SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), TAG_END());

1 0

[commit] r8720 - in freeswitch/trunk/libs/xmlrpc-c/lib: abyss/src util/include
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 12:10:18 2008 New Revision: 8720 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c freeswitch/trunk/libs/xmlrpc-c/lib/util/include/mallocvar.h Log: umm, yeah..... Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Thu May 29 12:10:18 2008 @@ -40,11 +40,12 @@ #include "socket_unix.h" -#define sane_close(_it) if (_it > 0) {close(_it) ; _it = -1; } +#define sane_close(_it) if (_it > -1) {close(_it) ; _it = -1; } typedef struct { int interruptorFd; int interrupteeFd; + int inuse; } interruptPipe; @@ -62,23 +63,22 @@ xmlrpc_asprintf(errorP, "Unable to create a pipe to use to interrupt " "waits. pipe() failed with errno %d (%s)", errno, strerror(errno)); + pipeP->inuse = 0; } else { *errorP = NULL; pipeP->interruptorFd = pipeFd[1]; pipeP->interrupteeFd = pipeFd[0]; + pipeP->inuse = 1; } } static void -termInterruptPipe(interruptPipe pipe) { - - if (pipe.interruptorFd) { - sane_close(pipe.interruptorFd); - } - if (pipe.interrupteeFd) { - sane_close(pipe.interrupteeFd); +termInterruptPipe(interruptPipe *pipeP) { + if (pipeP->inuse) { + sane_close(pipeP->interruptorFd); + sane_close(pipeP->interrupteeFd); } } @@ -154,7 +154,7 @@ struct socketUnix * const socketUnixP = channelP->implP; - termInterruptPipe(socketUnixP->interruptPipe); + termInterruptPipe(&socketUnixP->interruptPipe); if (!socketUnixP->userSuppliedFd) sane_close(socketUnixP->fd); @@ -510,7 +510,7 @@ *errorP = NULL; } if (*errorP) - termInterruptPipe(socketUnixP->interruptPipe); + termInterruptPipe(&socketUnixP->interruptPipe); } if (*errorP) free(socketUnixP); @@ -564,7 +564,7 @@ struct socketUnix * const socketUnixP = chanSwitchP->implP; - termInterruptPipe(socketUnixP->interruptPipe); + termInterruptPipe(&socketUnixP->interruptPipe); if (!socketUnixP->userSuppliedFd) sane_close(socketUnixP->fd); @@ -663,7 +663,7 @@ struct socketUnix * acceptedSocketP; MALLOCVAR(acceptedSocketP); - + if (!acceptedSocketP) xmlrpc_asprintf(errorP, "Unable to allocate memory"); else { @@ -805,7 +805,7 @@ if (!*errorP) { ChanSwitchCreate(&chanSwitchVtbl, socketUnixP, &chanSwitchP); if (*errorP) - termInterruptPipe(socketUnixP->interruptPipe); + termInterruptPipe(&socketUnixP->interruptPipe); if (chanSwitchP == NULL) xmlrpc_asprintf(errorP, "Unable to allocate memory for " Modified: freeswitch/trunk/libs/xmlrpc-c/lib/util/include/mallocvar.h ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/util/include/mallocvar.h (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/util/include/mallocvar.h Thu May 29 12:10:18 2008 @@ -102,7 +102,7 @@ #define MALLOCVAR(varName) \ - varName = malloc(sizeof(*varName)) + if (varName = malloc(sizeof(*varName))) memset(varName, 0, sizeof(*varName)) #define MALLOCVAR_NOFAIL(varName) \ do {if ((varName = malloc(sizeof(*varName))) == NULL) abort();} while(0)

1 0

[commit] r8719 - freeswitch/trunk
by Freeswitch SVN 29 May '08

29 May '08

Author: cypromis Date: Thu May 29 11:20:06 2008 New Revision: 8719 Modified: freeswitch/trunk/freeswitch.spec Log: Bumped version to 1.0 YAY Wheeee Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu May 29 11:20:06 2008 @@ -5,7 +5,7 @@ Summary: FreeSWITCH open source telephony platform License: MPL Group: Productivity/Telephony/Servers -Version: 1.0.rc6 +Version: 1.0 Release: 1 URL: http://www.freeswitch.org/ Packager: Michal Bielicki

1 0

[commit] r8718 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 29 May '08

29 May '08

Author: brian Date: Thu May 29 09:45:59 2008 New Revision: 8718 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Log: tweak Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Thu May 29 09:45:59 2008 @@ -17,7 +17,7 @@ <entry action="menu-sub" digits="4" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML default"/> - <entry action="menu-top" digits="9" param="demo_ivr"/>  + <entry action="menu-top" digits="9"/>  </menu>  <menu name="demo_ivr_submenu"

1 0

[commit] r8716 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 09:25:53 2008 New Revision: 8716 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: refactor to fix unregister event being skipped 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 Thu May 29 09:25:53 2008 @@ -672,42 +672,35 @@ switch_event_fire(&event); } - - /* - if (call_id) { - su_free(profile->home, call_id); - } - */ - if (regtype == REG_REGISTER) { char exp_param[128] = ""; + s_event = NULL; if (exptime) { switch_snprintf(exp_param, sizeof(exp_param), "expires=%ld", exptime); sip_contact_add_param(nh->nh_home, sip->sip_contact, exp_param); - } - - nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), NUTAG_WITH_THIS(nua), TAG_END()); - if (exptime) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, to_host); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", "%s", profile->name); - switch_event_fire(&event); - } else { - if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", contact_str); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", call_id); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime); - switch_event_fire(&s_event); - } + if (switch_event_create(&s_event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, to_host); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", "%s", profile->name); + } + } else { + if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", contact_str); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", call_id); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%ld", (long) exptime); } } + + nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), NUTAG_WITH_THIS(nua), TAG_END()); + if (s_event) { + switch_event_fire(&s_event); + } return 1; }

1 0

[commit] r8715 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Wed May 28 21:23:14 2008 New Revision: 8715 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Log: put bandaid on xmlrpc-c to not destroy the box for no reason Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Wed May 28 21:23:14 2008 @@ -40,7 +40,7 @@ #include "socket_unix.h" - +#define sane_close(_it) if (_it > 0) {close(_it) ; _it = -1; } typedef struct { int interruptorFd; @@ -50,19 +50,19 @@ static void -initInterruptPipe(interruptPipe * const pipeP, +initInterruptPipe(interruptPipe * pipeP, const char ** const errorP) { - int pipeFd[2]; + int pipeFd[2] = {-1, -1}; int rc; rc = pipe(pipeFd); - if (rc != 0) + if (rc != 0) { xmlrpc_asprintf(errorP, "Unable to create a pipe to use to interrupt " "waits. pipe() failed with errno %d (%s)", errno, strerror(errno)); - else { + } else { *errorP = NULL; pipeP->interruptorFd = pipeFd[1]; pipeP->interrupteeFd = pipeFd[0]; @@ -72,10 +72,14 @@ static void -termInterruptPipe(interruptPipe const pipe) { +termInterruptPipe(interruptPipe pipe) { - close(pipe.interruptorFd); - close(pipe.interrupteeFd); + if (pipe.interruptorFd) { + sane_close(pipe.interruptorFd); + } + if (pipe.interrupteeFd) { + sane_close(pipe.interrupteeFd); + } } @@ -153,7 +157,7 @@ termInterruptPipe(socketUnixP->interruptPipe); if (!socketUnixP->userSuppliedFd) - close(socketUnixP->fd); + sane_close(socketUnixP->fd); free(socketUnixP); } @@ -484,13 +488,13 @@ struct socketUnix * socketUnixP; MALLOCVAR(socketUnixP); - + if (socketUnixP == NULL) xmlrpc_asprintf(errorP, "Unable to allocate memory for Unix " "channel descriptor"); else { TChannel * channelP; - + socketUnixP->fd = fd; socketUnixP->userSuppliedFd = TRUE; @@ -498,7 +502,6 @@ if (!*errorP) { ChannelCreate(&channelVtbl, socketUnixP, &channelP); - if (channelP == NULL) xmlrpc_asprintf(errorP, "Unable to allocate memory for " "channel descriptor."); @@ -564,7 +567,7 @@ termInterruptPipe(socketUnixP->interruptPipe); if (!socketUnixP->userSuppliedFd) - close(socketUnixP->fd); + sane_close(socketUnixP->fd); free(socketUnixP); } @@ -728,13 +731,13 @@ rc = accept(listenSocketP->fd, &peerAddr, &size); if (rc >= 0) { - int const acceptedFd = rc; + int acceptedFd = rc; createChannelForAccept(acceptedFd, peerAddr, &channelP, channelInfoPP, errorP); if (*errorP) - close(acceptedFd); + sane_close(acceptedFd); } else if (errno == EINTR) interrupted = TRUE; else @@ -884,7 +887,7 @@ xmlrpc_asprintf(errorP, "socket() failed with errno %d (%s)", errno, strerror(errno)); else { - int const socketFd = rc; + int socketFd = rc; setSocketOptions(socketFd, errorP); if (!*errorP) { @@ -896,7 +899,7 @@ } } if (*errorP) - close(socketFd); + sane_close(socketFd); } }

1 0