- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5235 - freeswitch/trunk/src
by Freeswitch SVN 31 May '07

31 May '07

Author: mikej Date: Thu May 31 09:32:23 2007 New Revision: 5235 Modified: freeswitch/trunk/src/switch_core_session.c Log: declaration after code. Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu May 31 09:32:23 2007 @@ -718,11 +718,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session) { + switch_status_t status = SWITCH_STATUS_FALSE; switch_thread_t *thread; switch_threadattr_t *thd_attr;; + switch_threadattr_create(&thd_attr, session->pool); switch_threadattr_detach_set(thd_attr, 1); - switch_status_t status = SWITCH_STATUS_FALSE; switch_mutex_lock(session->mutex);

1 0

[commit] r5234 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 17:02:59 2007 New Revision: 5234 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 17:02:59 2007 @@ -14,7 +14,7 @@ LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -fPIC LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o -WTF=-fPIC -w -std=gnu99 -I../../../../libs/wanpipe-3.1.0/patches/kdrivers/include -I./libsangoma -I/usr/local/include -I../../../../libs/libpri-1.2.4 -I/usr/src/linux/include -I. -I/usr/include -D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -I/usr/home/jontow/freeswitch-trunk-clean/src/include -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -fPIC -g -O2 -Wall -D_GNU_SOURCE -DHAVE_CONFIG_H +WTF=-fPIC -w -std=gnu99 -I$(BASE)/libs/wanpipe-3.1.0/patches/kdrivers/include -I./libsangoma -I/usr/local/include -I../../../../libs/libpri-1.2.4 -I/usr/src/linux/include -I. -I/usr/include -D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(BASE)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -I$(BASE)/src/include -I$(BASE)/libs/libteletone/src -fPIC -g -O2 -Wall -D_GNU_SOURCE -DHAVE_CONFIG_H

1 0

[commit] r5233 - in freeswitch/trunk/src: . mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 16:57:17 2007 New Revision: 5233 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/switch_core_session.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Tue May 29 16:57:17 2007 @@ -1568,7 +1568,6 @@ ret = 0; goto done; } - switch_core_session_thread_launch(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create new Inbound Channel!\n"); } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue May 29 16:57:17 2007 @@ -681,6 +681,7 @@ switch_core_media_bug_remove_all(*session); switch_buffer_destroy(&(*session)->raw_read_buffer); switch_buffer_destroy(&(*session)->raw_write_buffer); + switch_channel_uninit((*session)->channel); pool = (*session)->pool; @@ -721,19 +722,26 @@ switch_threadattr_t *thd_attr;; switch_threadattr_create(&thd_attr, session->pool); switch_threadattr_detach_set(thd_attr, 1); + switch_status_t status = SWITCH_STATUS_FALSE; + switch_mutex_lock(session->mutex); + if (!session->thread_running) { + session->thread_running = 1; switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) == SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } else { + session->thread_running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create thread!\n"); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot double-launch thread!\n"); } - return SWITCH_STATUS_FALSE; + switch_mutex_unlock(session->mutex); + + return status; }

1 0

[commit] r5232 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 15:51:51 2007 New Revision: 5232 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: g's suck Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 15:51:51 2007 @@ -12,12 +12,18 @@ WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko") LIBSANGOMA_DIR=./libsangoma LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include -LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w +LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -fPIC LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o -LOCAL_LIBADD= +WTF=-fPIC -w -std=gnu99 -I../../../../libs/wanpipe-3.1.0/patches/kdrivers/include -I./libsangoma -I/usr/local/include -I../../../../libs/libpri-1.2.4 -I/usr/src/linux/include -I. -I/usr/include -D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w -I/usr/home/jontow/freeswitch-trunk-clean/src/include -I/usr/home/jontow/freeswitch-trunk-clean/libs/libteletone/src -fPIC -g -O2 -Wall -D_GNU_SOURCE -DHAVE_CONFIG_H + + include $(BASE)/build/modmake.rules +mod_wanpipe.o: mod_wanpipe.c + @echo Compiling $<... + $(CC) $(WTF) -c -o $@ $< || exit 1 + $(LIBSANGOMA_DIR)/libsangoma.o: $(LIBSANGOMA_DIR)/libsangoma.c $(CC) -c -I$(WANPIPE_DIR) $(LOCAL_CFLAGS) $(LIBSANGOMA_DIR)/libsangoma.c -o $(LIBSANGOMA_DIR)/libsangoma.o

1 0

[commit] r5231 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 15:04:41 2007 New Revision: 5231 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 15:04:41 2007 @@ -12,8 +12,9 @@ WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko") LIBSANGOMA_DIR=./libsangoma LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include -LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o +LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -w +LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o +LOCAL_LIBADD= include $(BASE)/build/modmake.rules @@ -44,3 +45,5 @@ local_install: $(WANPIPE_INSTALLED_KO) +local_clean: + rm -f libsangoma/*.o

1 0

[commit] r5230 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 29 May '07

29 May '07

Author: anthm Date: Tue May 29 14:55:37 2007 New Revision: 5230 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Tue May 29 14:55:37 2007 @@ -17,6 +17,13 @@ include $(BASE)/build/modmake.rules + +$(LIBSANGOMA_DIR)/libsangoma.o: $(LIBSANGOMA_DIR)/libsangoma.c + $(CC) -c -I$(WANPIPE_DIR) $(LOCAL_CFLAGS) $(LIBSANGOMA_DIR)/libsangoma.c -o $(LIBSANGOMA_DIR)/libsangoma.o + +$(LIBSANGOMA_DIR)/sangoma_pri.o: $(LIBSANGOMA_DIR)/sangoma_pri.c + $(CC) -c -I$(WANPIPE_DIR) $(LOCAL_CFLAGS) $(LIBSANGOMA_DIR)/sangoma_pri.c -o $(LIBSANGOMA_DIR)/sangoma_pri.o + testapp: testapp.c $(LIBSANGOMA_DIR)/libsangoma.o $(CC) -I$(WANPIPE_DIR)/api/lib $(CFLAGS) $(LOCAL_CFLAGS) lib_api.c testapp.c $(LIBSANGOMA_DIR)/libsangoma.o -o testapp

1 0

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

29 May '07

Author: anthm Date: Tue May 29 11:16:42 2007 New Revision: 5229 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue May 29 11:16:42 2007 @@ -1844,11 +1844,11 @@ if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { tech_pvt->reply_contact = tech_pvt->to_uri; } else { - tech_pvt->reply_contact = tech_pvt->profile->url; + tech_pvt->to_uri = switch_core_session_strdup(session, profile->url); } } else { - tech_pvt->to_uri = tech_pvt->profile->url; - tech_pvt->reply_contact = tech_pvt->profile->url; + tech_pvt->to_uri = switch_core_session_strdup(session, profile->url); + tech_pvt->reply_contact = tech_pvt->to_uri; } }

1 0

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

29 May '07

Author: anthm Date: Tue May 29 10:59:03 2007 New Revision: 5228 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Enact the 'No device left behind' act. All stupid sip params that only help broken things *MUST* be prefixed with NDLB- 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 Tue May 29 10:59:03 2007 @@ -317,7 +317,7 @@ } nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->to_uri), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); } @@ -680,7 +680,7 @@ sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->to_uri), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); switch_channel_mark_answered(channel); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue May 29 10:59:03 2007 @@ -114,6 +114,11 @@ PFLAG_RESPAWN = (1 << 9) } PFLAGS; + +typedef enum { + PFLAG_NDLB_TO_IN_200_CONTACT = (1 << 1) +} sofia_NDLB_t; + typedef enum { TFLAG_IO = (1 << 0), TFLAG_CHANGE_MEDIA = (1 << 1), @@ -223,6 +228,7 @@ int dtmf_duration; unsigned int flags; unsigned int pflags; + unsigned int ndlb; uint32_t max_calls; uint32_t nonce_ttl; nua_t *nua; @@ -287,6 +293,7 @@ switch_port_t adv_sdp_audio_port; char *proxy_sdp_audio_ip; switch_port_t proxy_sdp_audio_port; + char *reply_contact; char *from_uri; char *to_uri; char *from_address; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue May 29 10:59:03 2007 @@ -789,6 +789,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; } + } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) { + if (switch_true(val)) { + profile->ndlb |= PFLAG_NDLB_TO_IN_200_CONTACT; + } } else if (!strcasecmp(var, "pass-rfc2833")) { if (switch_true(val)) { profile->pflags |= PFLAG_PASS_RFC2833; @@ -1837,8 +1841,14 @@ url_set_chanvars(session, sip->sip_to->a_url, sip_to); if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s", val); + if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { + tech_pvt->reply_contact = tech_pvt->to_uri; + } else { + tech_pvt->reply_contact = tech_pvt->profile->url; + } } else { tech_pvt->to_uri = tech_pvt->profile->url; + tech_pvt->reply_contact = tech_pvt->profile->url; } } 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 Tue May 29 10:59:03 2007 @@ -365,7 +365,7 @@ } if (v_event && *v_event && (v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { - if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction")) { + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { if (contact->m_url->url_params) { snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params);

1 0

[commit] r5227 - freeswitch/trunk
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 13:20:57 2007 New Revision: 5227 Modified: freeswitch/trunk/configure.in Log: fix bsd build Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon May 28 13:20:57 2007 @@ -139,6 +139,9 @@ *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) ;; + *bsd*) + APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) + ;; esac APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)

1 0

[commit] r5226 - in freeswitch/trunk/libs/libedit: . src
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 01:52:34 2007 New Revision: 5226 Modified: freeswitch/trunk/libs/libedit/Makefile.am freeswitch/trunk/libs/libedit/src/el.c freeswitch/trunk/libs/libedit/src/sig.c freeswitch/trunk/libs/libedit/src/sig.h freeswitch/trunk/libs/libedit/src/term.c freeswitch/trunk/libs/libedit/src/unvis.c freeswitch/trunk/libs/libedit/src/vi.c freeswitch/trunk/libs/libedit/src/vis.c Log: fix bsd build Modified: freeswitch/trunk/libs/libedit/Makefile.am ============================================================================== --- freeswitch/trunk/libs/libedit/Makefile.am (original) +++ freeswitch/trunk/libs/libedit/Makefile.am Mon May 28 01:52:34 2007 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src examples doc +SUBDIRS = src ## GENERATED BY SCRIPT - DO NOT EDIT BELOW Modified: freeswitch/trunk/libs/libedit/src/el.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/el.c (original) +++ freeswitch/trunk/libs/libedit/src/el.c Mon May 28 01:52:34 2007 @@ -522,7 +522,9 @@ sigset_t oset, nset; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); /* get the correct window size */ Modified: freeswitch/trunk/libs/libedit/src/sig.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/sig.c (original) +++ freeswitch/trunk/libs/libedit/src/sig.c Mon May 28 01:52:34 2007 @@ -83,9 +83,11 @@ term__flush(); break; +#ifdef SIGWINCH case SIGWINCH: el_resize(sel); break; +#endif default: tty_cookedmode(sel); Modified: freeswitch/trunk/libs/libedit/src/sig.h ============================================================================== --- freeswitch/trunk/libs/libedit/src/sig.h (original) +++ freeswitch/trunk/libs/libedit/src/sig.h Mon May 28 01:52:34 2007 @@ -48,6 +48,7 @@ * Define here all the signals we are going to handle * The _DO macro is used to iterate in the source code */ +#ifdef SIGWINCH #define ALLSIGS \ _DO(SIGINT) \ _DO(SIGTSTP) \ @@ -57,6 +58,16 @@ _DO(SIGTERM) \ _DO(SIGCONT) \ _DO(SIGWINCH) +#else +#define ALLSIGS \ + _DO(SIGINT) \ + _DO(SIGTSTP) \ + _DO(SIGSTOP) \ + _DO(SIGQUIT) \ + _DO(SIGHUP) \ + _DO(SIGTERM) \ + _DO(SIGCONT) +#endif typedef void (*el_signalhandler_t)(int); typedef el_signalhandler_t *el_signal_t; Modified: freeswitch/trunk/libs/libedit/src/term.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/term.c (original) +++ freeswitch/trunk/libs/libedit/src/term.c Mon May 28 01:52:34 2007 @@ -905,7 +905,9 @@ int lins, cols; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); area = buf; Modified: freeswitch/trunk/libs/libedit/src/unvis.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/unvis.c (original) +++ freeswitch/trunk/libs/libedit/src/unvis.c Mon May 28 01:52:34 2007 @@ -63,7 +63,7 @@ #define S_HEX1 7 /* hex digit */ #define S_HEX2 8 /* hex digit 2 */ -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10)) /* Modified: freeswitch/trunk/libs/libedit/src/vi.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/vi.c (original) +++ freeswitch/trunk/libs/libedit/src/vi.c Mon May 28 01:52:34 2007 @@ -915,14 +915,14 @@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text; Modified: freeswitch/trunk/libs/libedit/src/vis.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/vis.c (original) +++ freeswitch/trunk/libs/libedit/src/vis.c Mon May 28 01:52:34 2007 @@ -106,7 +106,7 @@ #undef BELL #define BELL '\a' -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define iswhite(c) (c == ' ' || c == '\t' || c == '\n') #define issafe(c) (c == '\b' || c == BELL || c == '\r') #define xtoa(c) "0123456789abcdef"[c] @@ -208,8 +208,8 @@ } \ if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \ *dst++ = '\\'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 6) & 03) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 3) & 07) + '0'; \ *dst++ = (c & 07) + '0'; \ } else { \ if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \

1 0