- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10874 - freeswitch/trunk/libs/xmlrpc-c/Windows
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: mikej Date: Thu Dec 18 17:23:31 2008 New Revision: 10874 Log: fix build warnings. Modified: freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.2008.vcproj freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.2008.vcproj freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.2008.vcproj freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.2008.vcproj Modified: freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.2008.vcproj (original) +++ freeswitch/trunk/libs/xmlrpc-c/Windows/abyss.2008.vcproj Thu Dec 18 17:23:31 2008 @@ -54,7 +54,7 @@ ProgramDataBaseFileName=".\Debug\abyss/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.2008.vcproj (original) +++ freeswitch/trunk/libs/xmlrpc-c/Windows/xmlparse.2008.vcproj Thu Dec 18 17:23:31 2008 @@ -122,14 +122,14 @@ PreprocessorDefinitions="WIN32;_WINDOWS;XML_DTD;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug\xmlparse/xmlparse.pch" AssemblerListingLocation=".\Debug\xmlparse/" ObjectFile=".\Debug\xmlparse/" ProgramDataBaseFileName=".\Debug\xmlparse/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.2008.vcproj (original) +++ freeswitch/trunk/libs/xmlrpc-c/Windows/xmlrpc.2008.vcproj Thu Dec 18 17:23:31 2008 @@ -54,7 +54,7 @@ ProgramDataBaseFileName=".\Debug\xmlrpc/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -1115,11 +1115,11 @@ > </File> <File - RelativePath="..\lib\abyss\src\server.h" + RelativePath="..\include\xmlrpc-c\server.h" > </File> <File - RelativePath="..\include\xmlrpc-c\server.h" + RelativePath="..\lib\abyss\src\server.h" > </File> <File Modified: freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.2008.vcproj (original) +++ freeswitch/trunk/libs/xmlrpc-c/Windows/xmltok.2008.vcproj Thu Dec 18 17:23:31 2008 @@ -47,14 +47,14 @@ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;XML_DTD;XML_NS;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug\xmltok/xmltok.pch" AssemblerListingLocation=".\Debug\xmltok/" ObjectFile=".\Debug\xmltok/" ProgramDataBaseFileName=".\Debug\xmltok/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r10873 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: anthm Date: Thu Dec 18 15:33:21 2008 New Revision: 10873 Log: prevent seg in sofia dialog refresh on null dialog Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 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 Thu Dec 18 15:33:21 2008 @@ -1210,7 +1210,9 @@ unsigned delta = (unsigned) (exptime * -1); switch_snprintf(sstr, sizeof(sstr), "active;expires=%u", delta); switch_snprintf(expires_str, sizeof(expires_str), "%u", delta); - nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, delta, delta); + if (nh && nh->nh_ds && nh->nh_ds->ds_usage) { + nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, delta, delta); + } } nua_notify(nh, @@ -1661,9 +1663,9 @@ } - - nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); - + if (nh && nh->nh_ds && nh->nh_ds->ds_usage) { + nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); + } nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contact_str), NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr),

1 0

[commit] r10872 - freeswitch/trunk/support-d
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: intralanman Date: Thu Dec 18 15:27:28 2008 New Revision: 10872 Log: make sure we have access to essential tools Added: freeswitch/trunk/support-d/prereq.sh (contents, props changed) Added: freeswitch/trunk/support-d/prereq.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/support-d/prereq.sh Thu Dec 18 15:27:28 2008 @@ -0,0 +1,22 @@ +UNAME=`uname` + + +NEEDED_PACKAGES_YUM='automake autoconf libtool screen gdb gcc-c++ compat-gcc-32 compat-gcc-32-c++ subversion ncurses-devel unixODBC-devel' +NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ ' +NEEDED_PACKAGES_PKG_ADD='' + + + +echo ${UNAME} | grep "Linux" && GETTER='wget -c' +echo ${UNAME} | grep "BSD" && GETTER='fetch' + + +which apt-get >> /dev/null && INSTALLER='apt-get -y install' && NEEDED_PACKAGES=$NEEDED_PACAKGES_APT +which yum >> /dev/null && INSTALLER='yum -y install' && NEEDED_PACKAGES=$NEEDED_PACKAGES_YUM +which pkg_add >> /dev/null && INSTALLER='pkg_add -r' && NEEDED_PACKAGES=$NEEDED_PACKAGES_PKG_ADD + + +#echo $GETTER and $INSTALLER +#echo ${INSTALLER} ${NEEDED_PACKAGES} +${INSTALLER} ${NEEDED_PACKAGES} +

1 0

[commit] r10871 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: mikej Date: Thu Dec 18 15:02:05 2008 New Revision: 10871 Log: force -ggdb into sofia build Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Thu Dec 18 15:02:05 2008 @@ -44,7 +44,7 @@ $(mod_sofia_la_SOURCES) : $(BUILT_SOURCES) $(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update - cd $(SOFIA_DIR) && $(MAKE) + cd $(SOFIA_DIR) && $(MAKE) SOFIA_CFLAGS="$(AM_CFLAGS)" $(TOUCH_TARGET) ../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA)

1 0

[commit] r10869 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: cparker Date: Thu Dec 18 10:51:48 2008 New Revision: 10869 Log: Fix potential seg_fault reported in MODEVENT-35 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu Dec 18 10:51:48 2008 @@ -554,7 +554,8 @@ goto end; } } - if (profile->caller_extension && profile->caller_extension->last_application->application_name) { + if (profile->caller_extension && profile->caller_extension->last_application && + profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, (void *) profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source);

1 0

[commit] r10868 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: ericdc Date: Thu Dec 18 10:07:54 2008 New Revision: 10868 Log: Fixed json validation. Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/mod_http.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Thu Dec 18 10:07:54 2008 @@ -106,6 +106,7 @@ struct json_object *json_http_headers; char *key; struct json_object *val; + enum json_type jsontype; struct lh_entry *entry; int i; int j; @@ -133,7 +134,7 @@ if(argc != HTTP_PARAMS && argc != (HTTP_PARAMS - 1)){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n1\n"); + stream->write_function(stream, "-ERR\n"); return SWITCH_STATUS_SUCCESS; } @@ -154,7 +155,7 @@ body = (char *)malloc(1 * sizeof(char)); if(body == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n2\n"); + stream->write_function(stream, "-ERR\n"); return SWITCH_STATUS_SUCCESS; } body[0] = '\0'; @@ -164,7 +165,7 @@ buf = (char *)malloc(HTTP_BUFFER_SIZE * sizeof(char)); if(buf == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n3\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -176,7 +177,7 @@ request.url = (char *)malloc((l + 1) * sizeof(char)); if(request.url == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n4\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -193,12 +194,19 @@ json_http_headers = json_tokener_parse(headers_dec); if(is_error(json_http_headers)){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n5\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } - + jsontype = json_object_get_type(json_http_headers); + if(jsontype != json_type_object){ + switch_safe_free(ccmd); + stream->write_function(stream, "-ERR\n"); + GARBAGE_CLEANUP(); + return SWITCH_STATUS_SUCCESS; + } + i = 0; json_object_object_foreach(json_http_headers, key, val){ i++; @@ -216,7 +224,7 @@ request.headers[i].field_name = (char *)malloc((l + 1) * sizeof(char)); if(request.headers[i].field_name == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n6\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -226,13 +234,21 @@ strcpy(request.headers[i].field_name, key); a += strlen(key); + jsontype = json_object_get_type(val); + if(jsontype != json_type_string){ + switch_safe_free(ccmd); + stream->write_function(stream, "-ERR\n"); + GARBAGE_CLEANUP(); + return SWITCH_STATUS_SUCCESS; + } + value = json_object_get_string(val); /* value = json_object_to_json_string(val); */ l = strlen(value); request.headers[i].value = (char *)malloc((l + 1) * sizeof(char)); if(request.headers[i].value == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n7\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -265,7 +281,7 @@ if(ret == ERROR){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n8\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -285,7 +301,7 @@ json_response = (char *)malloc(l * sizeof(char)); if(json_response == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n9\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -295,7 +311,7 @@ t = (char *)malloc((response.body_len + 1) * sizeof(char)); if(t == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n10\n"); + stream->write_function(stream, "-ERR\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10867 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: gmaruzz Date: Thu Dec 18 10:00:03 2008 New Revision: 10867 Log: skypiax: seems to read/write audio native on windows, but there are still problems... Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Dec 18 10:00:03 2008 @@ -392,7 +392,7 @@ sent = frame->datalen; switch_file_write(p->audioskypepipe[1], (short *) frame->data, &sent); - DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); + //DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Thu Dec 18 10:00:03 2008 @@ -63,7 +63,7 @@ struct sockaddr_in remote_addr; int exit = 0; unsigned int kill_cli_size; - short kill_cli_buff[SAMPLES_PER_FRAME * sizeof(short)]; + short kill_cli_buff[SAMPLES_PER_FRAME]; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -117,57 +117,119 @@ fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 10000; + to.tv_usec = 100000; to.tv_sec = 0; rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //usleep(1000); //rt=1; if (rt > 0) { - len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); - //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); - if (len > 0) { - a = 0; - for (i = 0; i < len / sizeof(short); i++) { - srv_out[a] = srv_in[i]; - i++; - a++; - } + len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); + //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); - if (!p->audiobuf_is_loaded) { - for (i = 0; i < (len / sizeof(short)) / 2; i++) { - p->audiobuf[i] = srv_out[i]; - } - p->audiobuf_is_loaded = 1; - } else { - unsigned int howmany; - short totalbuf[SAMPLES_PER_FRAME]; + if(SAMPLERATE == 8000) { - howmany = len / 2 / 2; - for (i = 0; i < howmany; i++) - totalbuf[i] = p->audiobuf[i]; - - howmany = len / 2 / 2; - for (a = 0; a < howmany; a++) { - totalbuf[i] = srv_out[a]; - i++; - } + /****************************************************************/ + if (len > 0) { + a = 0; + for (i = 0; i < len / sizeof(short); i++) { + srv_out[a] = srv_in[i]; + i++; + a++; + } + + if (!p->audiobuf_is_loaded) { + for (i = 0; i < (len / sizeof(short)) / 2; i++) { + p->audiobuf[i] = srv_out[i]; + } + p->audiobuf_is_loaded = 1; + } else { + unsigned int howmany; + short totalbuf[SAMPLES_PER_FRAME]; + + howmany = len / 2 / 2; + for (i = 0; i < howmany; i++) + totalbuf[i] = p->audiobuf[i]; + + howmany = len / 2 / 2; + for (a = 0; a < howmany; a++) { + totalbuf[i] = srv_out[a]; + i++; + } + + howmany = len; + + switch_file_write(p->audiopipe[1], totalbuf, &howmany); + p->audiobuf_is_loaded = 0; + //DEBUGA_SKYPE("read=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, (len*sizeof(short))/2, howmany); + } + + } else if (len == 0) { + DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); + break; + } else { + ERRORA("len=%d\n", SKYPIAX_P_LOG, len); + exit = 1; + break; + } + /****************************************************************/ + } else if (SAMPLERATE == 16000) { + + + /****************************************************************/ + if (len > 0) { + if (len == SAMPLES_PER_FRAME * sizeof(short)) { + unsigned int howmany; + DEBUGA_SKYPE("SRV recv %d\n", SKYPIAX_P_LOG, len); + howmany = len; + + switch_file_write(p->audiopipe[1], srv_in, &howmany); + p->audiobuf_is_loaded = 0; + DEBUGA_SKYPE("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, len, howmany); + }else if (len == SAMPLES_PER_FRAME * sizeof(short) / 2) { + unsigned int howmany; + DEBUGA_SKYPE("SRV recv %d\n", SKYPIAX_P_LOG, len); + if (!p->audiobuf_is_loaded) { + for (i = 0; i < (len / sizeof(short)); i++) { + p->audiobuf[i] = srv_in[i]; + } + p->audiobuf_is_loaded = 1; + } else { + unsigned int howmany = SAMPLES_PER_FRAME * sizeof(short); + short totalbuf[SAMPLES_PER_FRAME]; + + for (i = 0; i < (len / sizeof(short)); i++) + totalbuf[i] = p->audiobuf[i]; + for (a = 0; a < (len / sizeof(short)); a++) { + totalbuf[i] = srv_in[a]; + i++; + } + + switch_file_write(p->audiopipe[1], totalbuf, &howmany); + p->audiobuf_is_loaded = 0; + DEBUGA_SKYPE("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, SAMPLES_PER_FRAME * sizeof(short), howmany); + } + } else { + + ERRORA("len=%d\n", SKYPIAX_P_LOG, len); + + } + + } else if (len == 0) { + DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); + break; + } else { + ERRORA("len=%d\n", SKYPIAX_P_LOG, len); + exit = 1; + break; + } + /****************************************************************/ - howmany = len; - switch_file_write(p->audiopipe[1], totalbuf, &howmany); - p->audiobuf_is_loaded = 0; - //DEBUGA_SKYPE("read=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, (len*sizeof(short))/2, howmany); - } - } else if (len == 0) { - DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); - break; - } else { - ERRORA("len=%d\n", SKYPIAX_P_LOG, len); - exit = 1; - break; - } + } else { + + ERRORA("SAMPLERATE can only be 8000 or 16000\n", SKYPIAX_P_LOG); + } } } @@ -286,9 +348,8 @@ FD_SET(fdselect, &fs); to.tv_usec = 10000; to.tv_sec = 0; - //rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //switch_sleep(5000); - rt = 1; + rt = select(fdselect + 1, &fs, NULL, NULL, &to); + //rt = 1; if (rt > 0) { /*********************************************/ if (SAMPLERATE == 8000) { @@ -322,11 +383,11 @@ switch_file_read(p->audioskypepipe[0], cli_in, &got); if (got > 0) { - DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); + //DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); len = send(fd, cli_in, got, 0); - DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); + //DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); if (len == 0) { ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); @@ -404,7 +465,7 @@ if (samples != SAMPLES_PER_FRAME * sizeof(short)) { if (samples) - DEBUGA_SKYPE("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, + DEBUGA_SKYPE("SRV PIPE READ=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); //do nothing } else {

1 0

[commit] r10866 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: ericdc Date: Wed Dec 17 19:31:07 2008 New Revision: 10866 Log: Removed debug information. Modified: freeswitch/trunk/src/mod/applications/mod_http/http_req.c Modified: freeswitch/trunk/src/mod/applications/mod_http/http_req.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/http_req.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/http_req.c Wed Dec 17 19:31:07 2008 @@ -308,29 +308,6 @@ sm.buf = buf; sm.buf_len = buf_len; - fprintf( - stderr, - "ERRORS\n" - "VERSION = %d\n" - "STATUS_CODE = %d\n" - "PHRASE = %d\n" - "HEADER = %d\n" - "NEWLINE = %d\n" - "SYNTAX_ERROR = %d\n", - VERSION, - STATUS_CODE, - PHRASE, - HEADER, - NEWLINE, - SYNTAX_ERROR - ); - - fprintf( - stderr, - "buf = \"%s\"\n", - buf - ); - pos = sm.pos; token = get_next_token(&sm); if(token != VERSION){ @@ -403,12 +380,6 @@ if(token != HEADER && token != PHRASE && token != STATUS_CODE) break; }while(token != SYNTAX_ERROR); - fprintf( - stderr, - "HEADERS = %d\n", - nt - ); - if(nt != 0){ response->headers = (http_header_t *)malloc(sizeof(http_header_t)*nt); if(response->headers == NULL){

1 0

[commit] r10865 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: ericdc Date: Wed Dec 17 19:28:17 2008 New Revision: 10865 Log: Major update. Many bug fixes. Modified: freeswitch/trunk/src/mod/applications/mod_http/http_req.c freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Modified: freeswitch/trunk/src/mod/applications/mod_http/http_req.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/http_req.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/http_req.c Wed Dec 17 19:28:17 2008 @@ -308,6 +308,29 @@ sm.buf = buf; sm.buf_len = buf_len; + fprintf( + stderr, + "ERRORS\n" + "VERSION = %d\n" + "STATUS_CODE = %d\n" + "PHRASE = %d\n" + "HEADER = %d\n" + "NEWLINE = %d\n" + "SYNTAX_ERROR = %d\n", + VERSION, + STATUS_CODE, + PHRASE, + HEADER, + NEWLINE, + SYNTAX_ERROR + ); + + fprintf( + stderr, + "buf = \"%s\"\n", + buf + ); + pos = sm.pos; token = get_next_token(&sm); if(token != VERSION){ @@ -379,7 +402,13 @@ if(token != HEADER && token != PHRASE && token != STATUS_CODE) break; }while(token != SYNTAX_ERROR); - + + fprintf( + stderr, + "HEADERS = %d\n", + nt + ); + if(nt != 0){ response->headers = (http_header_t *)malloc(sizeof(http_header_t)*nt); if(response->headers == NULL){ @@ -441,7 +470,6 @@ return ERROR; } - response->body = (char *)malloc((buf_len - sm.pos + 1) * sizeof(char)); if(response->body == NULL){ perror("Could not allocate memory for body"); Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/mod_http.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Wed Dec 17 19:28:17 2008 @@ -96,6 +96,7 @@ char *buf; char *method; char *url; + char *headers_dec; char *headers_str; char *value; char *body; @@ -132,11 +133,19 @@ if(argc != HTTP_PARAMS && argc != (HTTP_PARAMS - 1)){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n1\n"); return SWITCH_STATUS_SUCCESS; } method = argv[0]; + if(strcasecmp( "GET", method) == 0) request.method = GET; + else if(strcasecmp("POST", method) == 0) request.method = POST; + else if(strcasecmp("HEAD", method) == 0) request.method = HEAD; + else if(strcasecmp("DELETE", method) == 0) request.method = DELETE; + else if(strcasecmp("PUT", method) == 0) request.method = PUT; + + + url = argv[1]; headers_str = argv[2]; if(argc == HTTP_PARAMS){ @@ -145,7 +154,7 @@ body = (char *)malloc(1 * sizeof(char)); if(body == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n2\n"); return SWITCH_STATUS_SUCCESS; } body[0] = '\0'; @@ -155,7 +164,7 @@ buf = (char *)malloc(HTTP_BUFFER_SIZE * sizeof(char)); if(buf == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n3\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -167,50 +176,63 @@ request.url = (char *)malloc((l + 1) * sizeof(char)); if(request.url == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n4\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } GARBAGE_ADD(request.url); strcpy(request.url, url); - json_http_headers = json_tokener_parse(headers_str); + + + l = strlen(headers_str); + + headers_dec = url_decode(headers_str, l); + GARBAGE_ADD(headers_dec); + + json_http_headers = json_tokener_parse(headers_dec); if(is_error(json_http_headers)){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n5\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } + i = 0; json_object_object_foreach(json_http_headers, key, val){ i++; } request.header_len = i; - headers = (http_header_t *)malloc(i * sizeof(http_header_t)); + headers = (http_header_t *)malloc(i * sizeof(http_header_t)); + request.headers = headers; GARBAGE_ADD(headers); i = 0; json_object_object_foreach(json_http_headers, key, val){ l = strlen(key); + request.headers[i].field_name = (char *)malloc((l + 1) * sizeof(char)); if(request.headers[i].field_name == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n6\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } + GARBAGE_ADD(request.headers[i].field_name); + strcpy(request.headers[i].field_name, key); a += strlen(key); - value = json_object_to_json_string(val); + value = json_object_get_string(val); + /* value = json_object_to_json_string(val); */ l = strlen(value); request.headers[i].value = (char *)malloc((l + 1) * sizeof(char)); if(request.headers[i].value == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n7\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -230,6 +252,7 @@ }else request.body_len = 0; ret = http_req(&request, &response); + if(response.version != NULL) GARBAGE_ADD(response.version); if(response.phrase != NULL) GARBAGE_ADD(response.phrase); if(response.headers != NULL) GARBAGE_ADD(response.headers); @@ -242,7 +265,7 @@ if(ret == ERROR){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n8\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -262,7 +285,7 @@ json_response = (char *)malloc(l * sizeof(char)); if(json_response == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n9\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; } @@ -272,7 +295,7 @@ t = (char *)malloc((response.body_len + 1) * sizeof(char)); if(t == NULL){ switch_safe_free(ccmd); - stream->write_function(stream, "-ERR\n"); + stream->write_function(stream, "-ERR\n10\n"); GARBAGE_CLEANUP(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10864 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: mikej Date: Wed Dec 17 18:11:49 2008 New Revision: 10864 Log: typo Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Dec 17 18:11:49 2008 @@ -2986,7 +2986,7 @@ switch_core_db_exec(profile->master_db, "create index if not exists sr_sip_user on sip_registrations (sip_user)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_sip_host on sip_registrations (sip_host)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_profile_name on sip_registrations (profile_name)", NULL, NULL, NULL); - switch_core_db_exec(profile->master_db, "create index if not exists sr_presence_host on sip_registrations (presence_host)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists sr_presence_hosts on sip_registrations (presence_hosts)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_contact on sip_registrations (contact)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_expires on sip_registrations (expires)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_hostname on sip_registrations (hostname)", NULL, NULL, NULL); @@ -2996,7 +2996,7 @@ switch_core_db_exec(profile->master_db, "create index if not exists ss_hostname on sip_subscriptions (hostname)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists ss_sip_user on sip_subscriptions (sip_user)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists ss_sip_host on sip_subscriptions (sip_host)", NULL, NULL, NULL); - switch_core_db_exec(profile->master_db, "create index if not exists ss_presence_host on sip_subscriptions (presence_host)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ss_presence_hosts on sip_subscriptions (presence_hosts)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists ss_event on sip_subscriptions (event)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists ss_proto on sip_subscriptions (proto)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists ss_sub_to_user on sip_subscriptions (sub_to_user)", NULL, NULL, NULL);

1 0