May 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [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

[Freeswitch-svn] [commit] r8714 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 May '08

28 May '08

Author: anthm Date: Wed May 28 19:36:56 2008 New Revision: 8714 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix unregister with Contact: * 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 Wed May 28 19:36:56 2008 @@ -35,6 +35,7 @@ * */ #include "mod_sofia.h" +#include "nua_stack.h" static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg) { @@ -679,28 +680,14 @@ */ if (regtype == REG_REGISTER) { - char *new_contact = NULL; - char new_port[30] = ""; char exp_param[128] = ""; if (exptime) { - switch_snprintf(exp_param, sizeof(exp_param), ";expires=%ld", exptime); + switch_snprintf(exp_param, sizeof(exp_param), "expires=%ld", exptime); + sip_contact_add_param(nh->nh_home, sip->sip_contact, exp_param); } - - if (contact->m_url->url_port) { - switch_snprintf(new_port, sizeof(new_port), ":%s", contact->m_url->url_port); - } - - if (contact->m_url->url_params) { - new_contact = switch_mprintf("%s <sip:%s@%s%s;%s>%s", - display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params, exp_param); - } else { - new_contact = switch_mprintf("%s <sip:%s@%s%s>%s", display, contact->m_url->url_user, contact->m_url->url_host, new_port, exp_param); - } - - nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END()); - switch_safe_free(new_contact); + 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) {

1 0

[Freeswitch-svn] [commit] r8713 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 May '08

28 May '08

Author: anthm Date: Wed May 28 18:24:47 2008 New Revision: 8713 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix nat issue re: sofia_contact func 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 Wed May 28 18:24:47 2008 @@ -1055,7 +1055,8 @@ NUTAG_URL(url_str), SIPTAG_TO_STR(to_str), SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), TAG_END()); - if (strstr(tech_pvt->dest, ";nat") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { + if (strstr(tech_pvt->dest, ";nat") || strstr(tech_pvt->dest, ";received") + || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { switch_set_flag(tech_pvt, TFLAG_NAT); tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str); sticky = tech_pvt->record_route; 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 Wed May 28 18:24:47 2008 @@ -463,11 +463,11 @@ } if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>%s%s", - display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, received_data, is_nat ? ";nat" : ""); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s>", + display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, received_data, is_nat ? ";nat=yes" : ""); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>%s%s", display, contact->m_url->url_user, contact_host, new_port, - received_data, is_nat ? ";nat" : ""); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port, + received_data, is_nat ? ";nat=yes" : ""); } } @@ -517,10 +517,10 @@ if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>%s;nat", + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s%s;nat=yes>", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params, received_data); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>%s;nat", display, contact->m_url->url_user, network_ip, + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;nat=yes>", display, contact->m_url->url_user, network_ip, network_port, received_data); } if (strstr(v_contact_str, "tls")) {

1 0

[Freeswitch-svn] [commit] r8712 - in freeswitch/trunk/src/mod: applications/mod_fifo applications/mod_limit endpoints/mod_portaudio endpoints/mod_sofia xml_int/mod_xml_curl
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 17:36:16 2008 New Revision: 8712 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add more tab completion details Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed May 28 17:36:16 2008 @@ -1194,6 +1194,11 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "fifo", "Park with FIFO", FIFO_DESC, fifo_function, FIFO_USAGE, SAF_NONE); SWITCH_ADD_API(commands_api_interface, "fifo", "Return data about a fifo", fifo_api_function, FIFO_API_SYNTAX); + switch_console_set_complete("add fifo list"); + switch_console_set_complete("add fifo list_verbose"); + switch_console_set_complete("add fifo count"); + switch_console_set_complete("add fifo importance"); + globals.running = 1; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed May 28 17:36:16 2008 @@ -623,7 +623,13 @@ SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[insert|delete|select]/<realm>/<key>/<value>"); + switch_console_set_complete("add db insert"); + switch_console_set_complete("add db delete"); + switch_console_set_complete("add db select"); SWITCH_ADD_API(commands_api_interface, "group", "group [insert|delete|call]", group_api_function, "[insert|delete|call]:<group name>:<url>"); + switch_console_set_complete("add group insert"); + switch_console_set_complete("add group delete"); + switch_console_set_complete("add group call"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed May 28 17:36:16 2008 @@ -729,7 +729,19 @@ portaudio_endpoint_interface->state_handler = &portaudio_event_handlers; SWITCH_ADD_API(api_interface, "pa", "PortAudio", pa_cmd, "<command> [<args>]"); - + switch_console_set_complete("add pa help"); + switch_console_set_complete("add pa dump"); + switch_console_set_complete("add pa call"); + switch_console_set_complete("add pa answer"); + switch_console_set_complete("add pa hangup"); + switch_console_set_complete("add pa list"); + switch_console_set_complete("add pa switch"); + switch_console_set_complete("add pa dtmf"); + switch_console_set_complete("add pa flags"); + switch_console_set_complete("add pa devlist"); + switch_console_set_complete("add pa indev"); + switch_console_set_complete("add pa outdev"); + switch_console_set_complete("add pa ringdev"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } 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 Wed May 28 17:36:16 2008 @@ -1997,6 +1997,11 @@ management_interface->management_function = sofia_manage; SWITCH_ADD_API(api_interface, "sofia", "Sofia Controls", sofia_function, "<cmd> <args>"); + switch_console_set_complete("add sofia help"); + switch_console_set_complete("add sofia status"); + switch_console_set_complete("add sofia loglevel"); + switch_console_set_complete("add sofia profile"); + SWITCH_ADD_API(api_interface, "sofia_contact", "Sofia Contacts", sofia_contact_function, "[profile/]<user>@<domain>"); SWITCH_ADD_CHAT(chat_interface, SOFIA_CHAT_PROTO, sofia_presence_chat_send); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed May 28 17:36:16 2008 @@ -318,6 +318,9 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(xml_curl_api_interface, "xml_curl", "XML Curl", xml_curl_function, XML_CURL_SYNTAX); + switch_console_set_complete("add xml_curl debug_on"); + switch_console_set_complete("add xml_curl debug_off"); + if (do_config() == SWITCH_STATUS_SUCCESS) { curl_global_init(CURL_GLOBAL_ALL);

1 0

[Freeswitch-svn] [commit] r8711 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 17:14:06 2008 New Revision: 8711 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add more tab completion details Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed May 28 17:14:06 2008 @@ -2295,6 +2295,7 @@ SWITCH_ADD_API(commands_api_interface, "uuid_kill", "Kill Channel", kill_function, KILL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "reloadacl", "Reload ACL", reload_acl_function, "[reloadxml]"); + switch_console_set_complete("add reloadacl reloadxml"); SWITCH_ADD_API(commands_api_interface, "reloadxml", "Reload XML", reload_function, ""); SWITCH_ADD_API(commands_api_interface, "unload", "Unload Module", unload_function, LOAD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "load", "Load Module", load_function, LOAD_SYNTAX); @@ -2314,7 +2315,11 @@ switch_console_set_complete("add show aliases"); switch_console_set_complete("add show complete"); SWITCH_ADD_API(commands_api_interface, "complete", "Complete", complete_function, COMPLETE_SYNTAX); + switch_console_set_complete("add complete add"); + switch_console_set_complete("add complete del"); SWITCH_ADD_API(commands_api_interface, "alias", "Alias", alias_function, ALIAS_SYNTAX); + switch_console_set_complete("add alias add"); + switch_console_set_complete("add alias del"); SWITCH_ADD_API(commands_api_interface, "status", "status", status_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX); @@ -2329,6 +2334,14 @@ SWITCH_ADD_API(commands_api_interface, "uuid_display", "change display", uuid_display_function, DISPLAY_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX); + switch_console_set_complete("add fsctl hupall"); + switch_console_set_complete("add fsctl pause"); + switch_console_set_complete("add fsctl resume"); + switch_console_set_complete("add fsctl shutdown"); + switch_console_set_complete("add fsctl sync_clock"); + switch_console_set_complete("add fsctl reclaim_mem"); + switch_console_set_complete("add fsctl max_sessions"); + switch_console_set_complete("add fsctl max_dtmf_duration"); SWITCH_ADD_API(commands_api_interface, "help", "Show help for all the api commands", help_function, ""); SWITCH_ADD_API(commands_api_interface, "version", "Show version of the switch", version_function, ""); SWITCH_ADD_API(commands_api_interface, "sched_hangup", "Schedule a running call to hangup", sched_hangup_function, SCHED_HANGUP_SYNTAX);

1 0

[Freeswitch-svn] [commit] r8710 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 May '08

28 May '08

Author: anthm Date: Wed May 28 16:58:57 2008 New Revision: 8710 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: don't leave poor polycom out of the BLF fun 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 Wed May 28 16:58:57 2008 @@ -2471,7 +2471,9 @@ " sip_host VARCHAR(255),\n" " contact VARCHAR(1024),\n" " status VARCHAR(255),\n" - " rpid VARCHAR(255),\n" " expires INTEGER,\n" " user_agent VARCHAR(255)\n" ");\n"; + " rpid VARCHAR(255),\n" + " expires INTEGER,\n" + " user_agent VARCHAR(255)\n" ");\n"; char dialog_sql[] = "CREATE TABLE sip_dialogs (\n" @@ -2483,7 +2485,10 @@ " sip_from_host VARCHAR(255),\n" " contact_user VARCHAR(255),\n" " contact_host VARCHAR(255),\n" - " state VARCHAR(255),\n" " direction VARCHAR(255),\n" " user_agent VARCHAR(255)\n" ");\n"; + " state VARCHAR(255),\n" + " direction VARCHAR(255),\n" + " user_agent VARCHAR(255)\n" + ");\n"; char sub_sql[] = "CREATE TABLE sip_subscriptions (\n" @@ -2497,10 +2502,15 @@ " call_id VARCHAR(255),\n" " full_from VARCHAR(255),\n" " full_via VARCHAR(255),\n" - " expires INTEGER,\n" " user_agent VARCHAR(255),\n" " accept VARCHAR(255)\n" ");\n"; - - - char auth_sql[] = "CREATE TABLE sip_authentication (\n" " nonce VARCHAR(255),\n" " expires INTEGER" ");\n"; + " expires INTEGER,\n" + " user_agent VARCHAR(255),\n" + " accept VARCHAR(255)\n" + ");\n"; + + char auth_sql[] = + "CREATE TABLE sip_authentication (\n" + " nonce VARCHAR(255),\n" + " expires INTEGER" ");\n"; if (profile->odbc_dsn) { #ifdef SWITCH_HAVE_ODBC Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed May 28 16:58:57 2008 @@ -743,6 +743,50 @@ } +static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *rpid, char *prpid, char *status, char *note, const char **ct) +{ + if (switch_stristr("polycom", user_agent)) { + *ct = "application/xpidf+xml"; + return switch_mprintf( + "<?xml version=\"1.0\"?>\n" + "<!DOCTYPE presence PUBLIC \"-//IETF//DTD RFCxxxx XPIDF 1.0//EN\" \"xpidf.dtd\">\n" + "<presence>\n" + " <presentity uri=\"%s;method=SUBSCRIBE\" />\n" + " <atom id=\"%s\">\n" + " <address uri=\"%s;user=ip\" priority=\"0.800000\">\n" + " <status status=\"%s\" />\n" + " <msnsubstatus substatus=\"%s\" />\n" + " </address>\n" + " </atom>\n" + "</presence>\n", id, id, url, open, prpid + ); + } else { + *ct = "application/pidf+xml"; + return switch_mprintf( + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" + "<presence xmlns='urn:ietf:params:xml:ns:pidf'\n" + "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model'\n" + "xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid'\n" + "xmlns:c='urn:ietf:params:xml:ns:pidf:cipid'\n" + "entity='pres:%s'>\n" + " <status>\n" + " <note>%s</note>\n" + " </status>\n" + " <tuple id='t6a5ed77e'>\n" + " <status>\r\n" + " <basic>%s</basic>\n" + " </status>\n" + " </tuple>\n" + " <dm:person id='p06360c4a'>\n" + " <rpid:activities>\r\n" + " <rpid:%s/>\n" + " </rpid:activities>" + " </dm:person>\n" + "</presence>", id, status, prpid, rpid); + } +} + + static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames) { struct presence_helper *helper = (struct presence_helper *) pArg; @@ -761,6 +805,7 @@ char *event = argv[5]; char *call_id = argv[7]; char *expires = argv[10]; + char *user_agent = argv[11]; //char *accept = argv[12]; nua_handle_t *nh; char *to = NULL; @@ -974,30 +1019,7 @@ } prpid = translate_rpid(rpid); - pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" - "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n" - "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model'\r\n" - "xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid'\r\n" - "xmlns:c='urn:ietf:params:xml:ns:pidf:cipid'\r\n" - "entity='pres:%s'>\r\n" - "<presentity uri=\"%s;method=SUBSCRIBE\"/>\r\n" - "<atom id=\"1002\">\r\n" - "<address uri=\"%s\" priority=\"0.800000\">\r\n" - "<status status=\"%s\">\r\n" - "<note>%s</note>\r\n" - "</status>\r\n" - "<msnsubstatus substatus=\"%s\"/>\r\n" - "</address>\r\n" - "</atom>\r\n" - "<tuple id='t6a5ed77e'>\r\n" - "<status>\r\n" - "<basic>%s</basic>\r\n" - "</status>\r\n" - "</tuple>\r\n" - "<dm:person id='p06360c4a'>\r\n" - "<rpid:activities>\r\n" "<rpid:%s/>\r\n" - "</rpid:activities>%s</dm:person>\r\n" "</presence>", id, id, profile->url, open, status, prpid, open, rpid, note); - ct = "application/pidf+xml"; + pl = gen_pidf(user_agent, id, profile->url, open, rpid, prpid, status, note, &ct); } } else { @@ -1008,31 +1030,8 @@ note = NULL; open = "closed"; } - - pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" - "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n" - "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model'\r\n" - "xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid'\r\n" - "xmlns:c='urn:ietf:params:xml:ns:pidf:cipid'\r\n" - "entity='pres:%s'>\r\n" - "<presentity uri=\"%s;method=SUBSCRIBE\"/>\r\n" - "<atom id=\"1002\">\r\n" - "<address uri=\"%s\" priority=\"0.800000\">\r\n" - "<status status=\"%s\">\r\n" - "<note>%s</note>\r\n" - "</status>\r\n" - "<msnsubstatus substatus=\"%s\"/>\r\n" - "</address>\r\n" - "</atom>\r\n" - "<tuple id='t6a5ed77e'>\r\n" - "<status>\r\n" - "<basic>%s</basic>\r\n" - "</status>\r\n" - "</tuple>\r\n" - "<dm:person id='p06360c4a'>\r\n" - "<rpid:activities>\r\n" "<rpid:%s/>\r\n" - "</rpid:activities>%s</dm:person>\r\n" "</presence>", id, id, profile->url, open, status, prpid, open, rpid, note); - ct = "application/pidf+xml"; + prpid = translate_rpid(rpid); + pl = gen_pidf(user_agent, id, profile->url, open, rpid, prpid, status, note, &ct); } switch_snprintf(exp, sizeof(exp), "active;expires=%ld", (long) exptime);

1 0

[Freeswitch-svn] [commit] r8709 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 16:53:23 2008 New Revision: 8709 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add example of how modules can add their own commands to the tab complete db Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed May 28 16:53:23 2008 @@ -2302,6 +2302,17 @@ SWITCH_ADD_API(commands_api_interface, "pause", "Pause", pause_function, PAUSE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "show", "Show", show_function, SHOW_SYNTAX); + switch_console_set_complete("add show channels"); + switch_console_set_complete("add show codec"); + switch_console_set_complete("add show application"); + switch_console_set_complete("add show api"); + switch_console_set_complete("add show dialplan"); + switch_console_set_complete("add show file"); + switch_console_set_complete("add show timer"); + switch_console_set_complete("add show calls"); + switch_console_set_complete("add show channels"); + switch_console_set_complete("add show aliases"); + switch_console_set_complete("add show complete"); SWITCH_ADD_API(commands_api_interface, "complete", "Complete", complete_function, COMPLETE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "alias", "Alias", alias_function, ALIAS_SYNTAX); SWITCH_ADD_API(commands_api_interface, "status", "status", status_function, "");

1 0

[Freeswitch-svn] [commit] r8707 - freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 12:38:32 2008 New Revision: 8707 Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h Log: fix xmlrpc-c build on OS X 10.4 (FSBUILD-47) Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h (original) +++ freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h Wed May 28 12:38:32 2008 @@ -3,8 +3,12 @@ #include "util.h" +#ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif /* When we deallocate a pointer in a struct, we often replace it with ** this and throw in a few assertions here and there. */

1 0

[Freeswitch-svn] [commit] r8706 - in freeswitch/trunk/src: . mod/formats/mod_local_stream
by Freeswitch SVN 28 May '08

28 May '08

Author: anthm Date: Wed May 28 11:14:18 2008 New Revision: 8706 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_play_say.c Log: make local_stream more solid Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed May 28 11:14:18 2008 @@ -75,6 +75,8 @@ switch_mutex_t *mutex; switch_memory_pool_t *pool; int shuffle; + switch_thread_rwlock_t *rwlock; + int ready; }; typedef struct local_stream_source local_stream_source_t; @@ -115,11 +117,18 @@ skip = do_rand(); } - switch_core_hash_insert(globals.source_hash, source->name, source); + switch_thread_rwlock_create(&source->rwlock, source->pool); + + if (RUNNING) { + switch_mutex_lock(globals.mutex); + switch_core_hash_insert(globals.source_hash, source->name, source); + switch_mutex_unlock(globals.mutex); + source->ready = 1; + } while (RUNNING) { const char *fname; - + if (switch_dir_open(&source->dir_handle, source->location, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't open directory: %s\n", source->location); goto done; @@ -231,8 +240,14 @@ } done: + source->ready = 0; + switch_mutex_lock(globals.mutex); switch_core_hash_delete(globals.source_hash, source->name); + switch_mutex_unlock(globals.mutex); + switch_thread_rwlock_wrlock(source->rwlock); + switch_thread_rwlock_unlock(source->rwlock); + switch_buffer_destroy(&audio_buffer); if (fd > -1) { @@ -264,6 +279,11 @@ } else { source = switch_core_hash_find(globals.source_hash, path); } + if (source) { + if (switch_thread_rwlock_tryrdlock(source->rwlock) != SWITCH_STATUS_SUCCESS) { + source = NULL; + } + } switch_mutex_unlock(globals.mutex); if (!source) { @@ -330,7 +350,8 @@ context->source->total--; switch_mutex_unlock(context->source->mutex); switch_buffer_destroy(&context->audio_buffer); - + switch_thread_rwlock_unlock(context->source->rwlock); + return SWITCH_STATUS_SUCCESS; } @@ -340,6 +361,11 @@ switch_size_t bytes = 0; size_t need = *len * 2; + if (!context->source->ready) { + *len = 0; + return SWITCH_STATUS_FALSE; + } + switch_mutex_lock(context->audio_mutex); if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { *len = bytes / 2; Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed May 28 11:14:18 2008 @@ -133,6 +133,7 @@ } if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS) { + *len = 0; goto done; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed May 28 11:14:18 2008 @@ -1021,7 +1021,9 @@ if (!asis) { olen /= 2; } - switch_core_file_read(fh, abuf, &olen); + if (switch_core_file_read(fh, abuf, &olen) != SWITCH_STATUS_SUCCESS) { + break; + } switch_buffer_write(fh->audio_buffer, abuf, asis ? olen : olen * 2); olen = switch_buffer_read(fh->audio_buffer, abuf, framelen); if (!asis) {

1 0

[Freeswitch-svn] [commit] r8705 - freeswitch/trunk
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 10:11:26 2008 New Revision: 8705 Modified: freeswitch/trunk/freeswitch.spec Log: FSBUILD-46, missing ./ Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Wed May 28 10:11:26 2008 @@ -180,7 +180,7 @@ if test ! -f Makefile.in then - bootstrap.sh + ./bootstrap.sh fi

1 0