May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8564 - freeswitch/trunk/src
by Freeswitch SVN 24 May '08

24 May '08

Author: brian Date: Fri May 23 20:02:18 2008 New Revision: 8564 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix gentones on_dtmf callback 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 Fri May 23 20:02:18 2008 @@ -589,6 +589,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_gentones(switch_core_session_t *session, char *script, int32_t loops, switch_input_args_t *args) { teletone_generation_session_t ts; + switch_dtmf_t dtmf = {0}; switch_buffer_t *audio_buffer; switch_frame_t *read_frame = NULL; switch_codec_t *read_codec = NULL, write_codec = { 0 }; @@ -624,6 +625,7 @@ } for(;;) { + int done = 0; switch_status_t status; if (!switch_channel_ready(channel)) { @@ -643,8 +645,37 @@ break; } - if (args && (args->read_frame_callback)) { - if (args->read_frame_callback(session, read_frame, args->user_data) != SWITCH_STATUS_SUCCESS) { + if (args && (args->input_callback || args->buf || args->buflen)) { + /* + dtmf handler function you can hook up to be executed when a digit is dialed during gentones + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + */ + if (switch_channel_has_dtmf(channel)) { + if (!args->input_callback && !args->buf) { + status = SWITCH_STATUS_BREAK; + done = 1; + break; + } + switch_channel_dequeue_dtmf(channel, &dtmf); + if (args->input_callback) { + status = args->input_callback(session, (void *)&dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); + } else { + *((char *)args->buf) = dtmf.digit; + status = SWITCH_STATUS_BREAK; + } + } + + if (args->input_callback) { + switch_event_t *event; + + if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); + switch_event_destroy(&event); + } + } + + if (status != SWITCH_STATUS_SUCCESS) { + done = 1; break; } }

1 0

[commit] r8563 - freeswitch/trunk/src
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 19:53:10 2008 New Revision: 8563 Modified: freeswitch/trunk/src/switch_rtp.c Log: more nat goodies for proxy media mode Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 23 19:53:10 2008 @@ -1130,7 +1130,34 @@ goto end; } - if (bytes > 0) { + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { + const char *tx_host; + const char *old_host; + char bufa[30], bufb[30]; + tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); + old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); + if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { + const char *err; + uint32_t old = rtp_session->remote_port; + + if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { + if (++rtp_session->autoadj_tally >= 10) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, + switch_sockaddr_get_port(rtp_session->from_addr)); + switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + } + } + } + } + + if (bytes && rtp_session->autoadj_window) { + if (--rtp_session->autoadj_window == 0) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } + } + + if (bytes) { rtp_session->missed_count = 0; } @@ -1372,33 +1399,6 @@ goto end; } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { - const char *tx_host; - const char *old_host; - char bufa[30], bufb[30]; - tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); - old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); - if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { - const char *err; - uint32_t old = rtp_session->remote_port; - - if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { - if (++rtp_session->autoadj_tally >= 10) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, - switch_sockaddr_get_port(rtp_session->from_addr)); - switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); - } - } - } - } - - if (rtp_session->autoadj_window) { - if (--rtp_session->autoadj_window == 0) { - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); - } - } - if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { goto do_continue; }

1 0

[commit] r8562 - freeswitch/trunk
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 19:09:08 2008 New Revision: 8562 Modified: freeswitch/trunk/bootstrap.sh freeswitch/trunk/configure.in Log: don't configure xmlrpc-c anymore (we will merge with ours Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri May 23 19:09:08 2008 @@ -5,7 +5,7 @@ LIBDIR=${BASEDIR}/libs; SUBDIRS="codec/ilbc curl iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ - speex sqlite srtp xmlrpc-c openzap"; + speex sqlite srtp openzap"; if [ ! -f modules.conf ]; then Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 23 19:09:08 2008 @@ -608,7 +608,6 @@ AC_CONFIG_SUBDIRS(libs/libsndfile) AC_CONFIG_SUBDIRS(libs/sofia-sip) AC_CONFIG_SUBDIRS(libs/speex) -AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) AC_CONFIG_SUBDIRS(libs/openmrcp) AC_CONFIG_SUBDIRS(libs/openzap)

1 0

[commit] r8561 - freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:59:41 2008 New Revision: 8561 Modified: freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c Log: remove GNU_SOURCE from c file (we push from build system instead Modified: freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc_transport/xmlrpc_transport.c Fri May 23 18:59:41 2008 @@ -2,7 +2,7 @@ an XML-RPC call. */ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdlib.h> #include <stdio.h>

1 0

[commit] r8560 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:59:08 2008 New Revision: 8560 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: update makefile to new lib build Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Fri May 23 18:59:08 2008 @@ -1,18 +1,78 @@ BASE=../../../.. XMLRPC_DIR=$(BASE)/libs/xmlrpc-c -#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la +LOCAL_OBJS = $(XMLRPC_DIR)/lib/libutil/asprintf.o\ +$(XMLRPC_DIR)/lib/util/casprintf.o\ +$(XMLRPC_DIR)/lib/abyss/src/channel.o\ +$(XMLRPC_DIR)/lib/abyss/src/chanswitch.o\ +$(XMLRPC_DIR)/lib/util/cmdline_parser.o\ +$(XMLRPC_DIR)/lib/abyss/src/conf.o\ +$(XMLRPC_DIR)/lib/abyss/src/conn.o\ +$(XMLRPC_DIR)/lib/abyss/src/data.o\ +$(XMLRPC_DIR)/lib/abyss/src/date.o\ +$(XMLRPC_DIR)/src/double.o\ +$(XMLRPC_DIR)/lib/libutil/error.o\ +$(XMLRPC_DIR)/lib/abyss/src/file.o\ +$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\ +$(XMLRPC_DIR)/lib/util/getoptx.o\ +$(XMLRPC_DIR)/lib/abyss/src/handler.o\ +$(XMLRPC_DIR)/lib/abyss/src/http.o\ +$(XMLRPC_DIR)/lib/abyss/src/init.o\ +$(XMLRPC_DIR)/lib/libutil/make_printable.o\ +$(XMLRPC_DIR)/lib/libutil/memblock.o\ +$(XMLRPC_DIR)/src/method.o\ +$(XMLRPC_DIR)/src/parse_value.o\ +$(XMLRPC_DIR)/src/registry.o\ +$(XMLRPC_DIR)/src/resource.o\ +$(XMLRPC_DIR)/lib/abyss/src/response.o\ +$(XMLRPC_DIR)/lib/libutil/select.o\ +$(XMLRPC_DIR)/lib/abyss/src/server.o\ +$(XMLRPC_DIR)/lib/abyss/src/session.o\ +$(XMLRPC_DIR)/lib/libutil/sleep.o\ +$(XMLRPC_DIR)/lib/abyss/src/socket.o\ +$(XMLRPC_DIR)/lib/abyss/src/socket_unix.o\ +$(XMLRPC_DIR)/lib/util/string_parser.o\ +$(XMLRPC_DIR)/lib/util/stripcaseeq.o\ +$(XMLRPC_DIR)/src/system_method.o\ +$(XMLRPC_DIR)/lib/abyss/src/thread_pthread.o\ +$(XMLRPC_DIR)/lib/libutil/time.o\ +$(XMLRPC_DIR)/lib/abyss/src/token.o\ +$(XMLRPC_DIR)/src/trace.o\ +$(XMLRPC_DIR)/lib/abyss/src/trace.o\ +$(XMLRPC_DIR)/lib/libutil/utf8.o\ +$(XMLRPC_DIR)/src/version.o\ +$(XMLRPC_DIR)/lib/expat/xmlparse/xmlparse.o\ +$(XMLRPC_DIR)/lib/expat/xmltok/xmlrole.o\ +$(XMLRPC_DIR)/src/xmlrpc_array.o\ +$(XMLRPC_DIR)/src/xmlrpc_authcookie.o\ +$(XMLRPC_DIR)/src/xmlrpc_base64.o\ +$(XMLRPC_DIR)/src/xmlrpc_build.o\ +$(XMLRPC_DIR)/src/xmlrpc_data.o\ +$(XMLRPC_DIR)/src/xmlrpc_datetime.o\ +$(XMLRPC_DIR)/src/xmlrpc_decompose.o\ +$(XMLRPC_DIR)/src/xmlrpc_expat.o\ +$(XMLRPC_DIR)/src/xmlrpc_parse.o\ +$(XMLRPC_DIR)/src/xmlrpc_serialize.o\ +$(XMLRPC_DIR)/src/xmlrpc_server_abyss.o\ +$(XMLRPC_DIR)/src/xmlrpc_server_cgi.o\ +$(XMLRPC_DIR)/src/xmlrpc_string.o\ +$(XMLRPC_DIR)/src/xmlrpc_struct.o\ +$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o + +#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.a #dont ask... -XMLRPCLAS = $(XMLRPC_DIR)/src/*.o -XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la -XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la -XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.la +#XMLRPCLAS = $(XMLRPC_DIR)/src/*.o +#XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.so $(XMLRPC_DIR)/src/libxmlrpc.so +#XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.so $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.so +#XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.so $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.so LOCAL_LIBADD =$(XMLRPCLAS) -LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include +LOCAL_CFLAGS=-w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include -I../../../../libs/xmlrpc-c/lib/abyss/src -I../../../../libs/xmlrpc-c/lib/util/include include $(BASE)/build/modmake.rules $(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update cd $(XMLRPC_DIR) && $(MAKE) $(TOUCH_TARGET) + +

1 0

[commit] r8559 - freeswitch/trunk/libs/xmlrpc-c
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:55:40 2008 New Revision: 8559 Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in Log: not supposed to do that in a conditional Modified: freeswitch/trunk/libs/xmlrpc-c/configure.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/configure.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/configure.in Fri May 23 18:55:40 2008 @@ -198,9 +198,7 @@ dnl ======================================================================= AC_PROG_CC -if test x"$enable_cplusplus" != xno; then - AC_PROG_CXX -fi +AC_PROG_CXX dnl =======================================================================

1 0

[commit] r8558 - in freeswitch/trunk/libs/xmlrpc-c: lib/libutil lib/util tools/lib tools/xmlrpc
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:54:19 2008 New Revision: 8558 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c Log: remove GNU_SOURCE from c files, push from build system instead Modified: freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/libutil/asprintf.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdarg.h> #include <stdio.h> #include <stdlib.h> Modified: freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/libutil/make_printable.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdarg.h> #include <string.h> Modified: freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/util/casprintf.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdarg.h> #include <stdio.h> #include <stdlib.h> Modified: freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/util/stripcaseeq.c Fri May 23 18:54:19 2008 @@ -1,4 +1,4 @@ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <ctype.h> #include "bool.h" Modified: freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/tools/lib/dumpvalue.c Fri May 23 18:54:19 2008 @@ -5,7 +5,7 @@ used for debugging purposes in other places. */ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdlib.h> #include <stdio.h> Modified: freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/tools/xmlrpc/xmlrpc.c Fri May 23 18:54:19 2008 @@ -35,7 +35,7 @@ */ -#define _GNU_SOURCE +//#define _GNU_SOURCE #include <stdlib.h> #include <stdio.h>

1 0

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

23 May '08

Author: anthm Date: Fri May 23 18:30:50 2008 New Revision: 8557 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix 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 Fri May 23 18:30:50 2008 @@ -767,27 +767,29 @@ tech_pvt->remote_sdp_video_ip = switch_core_session_strdup(tech_pvt->session, rip); tech_pvt->remote_sdp_video_port = (switch_port_t) atoi(rvp); } - - if (!strcmp(tech_pvt->remote_sdp_video_ip, rip) && atoi(rvp) == tech_pvt->remote_sdp_video_port) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n", - tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); - } else { - switch_set_flag_locked(tech_pvt, TFLAG_VIDEO); - switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); - if (switch_rtp_ready(tech_pvt->video_rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) != - SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n", - tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port); - /* Reactivate the NAT buster flag. */ - switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + + if (tech_pvt->remote_sdp_video_ip && tech_pvt->remote_sdp_video_port) { + if (!strcmp(tech_pvt->remote_sdp_video_ip, rip) && atoi(rvp) == tech_pvt->remote_sdp_video_port) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n", + tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); + } else { + switch_set_flag_locked(tech_pvt, TFLAG_VIDEO); + switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); + if (switch_rtp_ready(tech_pvt->video_rtp_session)) { + if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) != + SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n", + tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port); + /* Reactivate the NAT buster flag. */ + switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } } } } - if (!strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) { + if (tech_pvt->remote_sdp_audio_ip && !strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r8556 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 18:23:21 2008 New Revision: 8556 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Fri May 23 18:23:21 2008 @@ -113,13 +113,13 @@ } -static void lua_parse_and_execute(lua_State *L, char *input_code) +static int lua_parse_and_execute(lua_State *L, char *input_code) { int error = 0; if (switch_strlen_zero(input_code)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No code to execute!\n"); - return; + return 1; } if (*input_code == '~') { @@ -172,6 +172,8 @@ } lua_pop(L, 1); /* pop error message from the stack */ } + + return error; } static void *SWITCH_THREAD_FUNC lua_thread_run(switch_thread_t *thread, void *obj) @@ -298,13 +300,15 @@ lua_State *L = lua_init(); char code[1024] = ""; char *mycmd; + int error; + if (switch_strlen_zero(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no args specified!\n"); return; } snprintf(code, sizeof(code), "~session = freeswitch.Session(\"%s\");", switch_core_session_get_uuid(session)); - lua_parse_and_execute(L, code); + error = lua_parse_and_execute(L, code); mycmd = strdup((char *)data); switch_assert(mycmd); @@ -312,10 +316,11 @@ lua_parse_and_execute(L, mycmd); lua_uninit(L); free(mycmd); + } SWITCH_STANDARD_API(luarun_api_function) { - + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-ERR no args specified!\n"); } else { @@ -331,7 +336,8 @@ lua_State *L = lua_init(); char *mycmd; - + int error; + if (switch_strlen_zero(cmd)) { stream->write_function(stream, ""); } else { @@ -344,7 +350,13 @@ mod_lua_conjure_event(L, stream->event, "env", 1); } - lua_parse_and_execute(L, mycmd); + if ((error = lua_parse_and_execute(L, mycmd))) { + if (switch_event_get_header(stream->event, "http-host")) { + stream->write_function(stream, "Content-Type: text/html\n\n<H2>Error Executing Script</H2>"); + } else { + stream->write_function(stream, "-ERR encounterd\n"); + } + } lua_uninit(L); free(mycmd); }

1 0

[commit] r8555 - in freeswitch/trunk: . libs/xmlrpc-c libs/xmlrpc-c/Windows libs/xmlrpc-c/lib src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 23 May '08

23 May '08

Author: mikej Date: Fri May 23 17:43:41 2008 New Revision: 8555 Added: freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.2008.vcproj freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.vcproj Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/xmlrpc-c/ (props changed) freeswitch/trunk/libs/xmlrpc-c/lib/ (props changed) freeswitch/trunk/libs/xmlrpc-c/version.h freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj Log: working windows build for mod_xml_rpc and xmlrpc-c Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri May 23 17:43:41 2008 @@ -862,6 +862,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlparse", "libs\xmlrpc-c\Windows\xmlparse.2008.vcproj", "{0D108721-EAE8-4BAF-8102-D8960EC93647}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\xmlrpc-c\Windows\xmltok.2008.vcproj", "{B535402E-38D2-4D54-8360-423ACBD17192}" + ProjectSection(ProjectDependencies) = postProject + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7} = {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gennmtab", "libs\xmlrpc-c\Windows\gennmtab.2008.vcproj", "{A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1449,6 +1454,12 @@ {B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.ActiveCfg = Release|Win32 {B535402E-38D2-4D54-8360-423ACBD17192}.Release|Win32.Build.0 = Release|Win32 {B535402E-38D2-4D54-8360-423ACBD17192}.Release|x64.ActiveCfg = Release|Win32 + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}.Debug|Win32.Build.0 = Debug|Win32 + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}.Debug|x64.ActiveCfg = Debug|Win32 + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}.Release|Win32.ActiveCfg = Release|Win32 + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}.Release|Win32.Build.0 = Release|Win32 + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1532,6 +1543,7 @@ {CEE544A9-0303-44C2-8ECE-EFA7D7BCBBBA} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {0D108721-EAE8-4BAF-8102-D8960EC93647} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {B535402E-38D2-4D54-8360-423ACBD17192} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {A6F149DA-CD8D-4E8E-B914-25DFFE6269A7} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} Added: freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.2008.vcproj Fri May 23 17:43:41 2008 @@ -0,0 +1,242 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="gennmtab" + ProjectGUID="{A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}" + RootNamespace="gennmtab" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug\gennmtab" + IntermediateDirectory=".\Debug\gennmtab" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug\gennmtab/gennmtab.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..;." + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug\gennmtab/gennmtab.pch" + AssemblerListingLocation=".\Debug\gennmtab/" + ObjectFile=".\Debug\gennmtab/" + ProgramDataBaseFileName=".\Debug\gennmtab/" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="2057" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="..\bin\gennmtabD.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug\gennmtab/gennmtabD.pdb" + SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug\gennmtab/gennmtab.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + Description="(D) Generating nametab.h ..." + CommandLine="..\bin\gennmtabD.exe >..\lib\expat\xmltok\nametab.h" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release\gennmtab" + IntermediateDirectory=".\Release\gennmtab" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release\gennmtab/gennmtab.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..;." + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release\gennmtab/gennmtab.pch" + AssemblerListingLocation=".\Release\gennmtab/" + ObjectFile=".\Release\gennmtab/" + ProgramDataBaseFileName=".\Release\gennmtab/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="2057" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="..\bin\gennmtab.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile=".\Release\gennmtab/gennmtab.pdb" + SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release\gennmtab/gennmtab.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + Description="(R) Generating nametab.h ..." + CommandLine="..\bin\gennmtab.exe >..\lib\expat\xmltok\nametab.h" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90" + > + <File + RelativePath="..\lib\expat\gennmtab\gennmtab.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;fi;fd" + > + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/xmlrpc-c/Windows/gennmtab.vcproj Fri May 23 17:43:41 2008 @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="gennmtab" + ProjectGUID="{A6F149DA-CD8D-4E8E-B914-25DFFE6269A7}" + RootNamespace="gennmtab" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug\gennmtab" + IntermediateDirectory=".\Debug\gennmtab" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug\gennmtab/gennmtab.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".." + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug\gennmtab/gennmtab.pch" + AssemblerListingLocation=".\Debug\gennmtab/" + ObjectFile=".\Debug\gennmtab/" + ProgramDataBaseFileName=".\Debug\gennmtab/" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="2057" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="..\bin\gennmtabD.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug\gennmtab/gennmtabD.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug\gennmtab/gennmtab.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + Description="(D) Generating nametab.h ..." + CommandLine="..\bin\gennmtabD.exe >..\lib\expat\xmltok\nametab.h" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release\gennmtab" + IntermediateDirectory=".\Release\gennmtab" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release\gennmtab/gennmtab.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=".." + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release\gennmtab/gennmtab.pch" + AssemblerListingLocation=".\Release\gennmtab/" + ObjectFile=".\Release\gennmtab/" + ProgramDataBaseFileName=".\Release\gennmtab/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="2057" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="..\bin\gennmtab.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile=".\Release\gennmtab/gennmtab.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release\gennmtab/gennmtab.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + Description="(R) Generating nametab.h ..." + CommandLine="..\bin\gennmtab.exe >..\lib\expat\xmltok\nametab.h" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90" + > + <File + RelativePath="..\lib\expat\gennmtab\gennmtab.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;fi;fd" + > + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/xmlrpc-c/version.h ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/version.h (original) +++ freeswitch/trunk/libs/xmlrpc-c/version.h Fri May 23 17:43:41 2008 @@ -1,4 +1,8 @@ -/* Change this for each release. */ - -#define XMLRPC_C_VERSION "1.03.14" - +#ifndef XMLRPC_C_VERSION_INCLUDED +#define XMLRPC_C_VERSION_INCLUDED +/* generated by Windows/mkvers.bat on Fri 05/23/2008 ... */ +#define XMLRPC_C_VERSION "Xmlrpc-c 1.14.99" +#define XMLRPC_VERSION_MAJOR 1 +#define XMLRPC_VERSION_MINOR 14 +#define XMLRPC_VERSION_POINT 99 +#endif Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj Fri May 23 17:43:41 2008 @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\Windows"" PreprocessorDefinitions="ABYSS_WIN32" UsePrecompiledHeader="0" /> @@ -103,7 +103,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\abyss\src";"$(InputDir)..\..\..\..\libs\xmlrpc-c\lib\util\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\Windows"" PreprocessorDefinitions="ABYSS_WIN32" UsePrecompiledHeader="0" />

1 0