February 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4171 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 16:08:45 2007 New Revision: 4171 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: add a more descriptive error message on no (or no usable) candidates Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 8 16:08:45 2007 @@ -703,6 +703,7 @@ } if (!(tech_pvt->remote_ip && tech_pvt->remote_port)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No valid candidates received!\n"); return 0; }

1 0

[commit] r4170 - in freeswitch/trunk/src: . include
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: anthm Date: Thu Feb 8 15:47:46 2007 New Revision: 4170 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core.c Log: fix bug/race in core Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Feb 8 15:47:46 2007 @@ -485,6 +485,8 @@ CF_NOMEDIA = (1 << 13) - Channel has no media CF_SUSPEND = (1 << 14) - Suspend i/o CF_EVENT_PARSE = (1 << 15) - Suspend control events +CF_NO_INDICATE = (1 << 16) - Disable Indications +CF_REPEAT_STATE = (1 << 17) - Tell the state machine to repeat a state </pre> */ @@ -505,7 +507,8 @@ CF_NOMEDIA = (1 << 13), CF_SUSPEND = (1 << 14), CF_EVENT_PARSE = (1 << 15), - CF_NO_INDICATE = (1 << 16) + CF_NO_INDICATE = (1 << 16), + CF_REPEAT_STATE = (1 << 17) } switch_channel_flag_t; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Feb 8 15:47:46 2007 @@ -3014,6 +3014,7 @@ const switch_endpoint_interface_t *endpoint_interface; const switch_state_handler_table_t *driver_state_handler = NULL; const switch_state_handler_table_t *application_state_handler = NULL; + #ifdef CRASH_PROT switch_thread_id_t thread_id = switch_thread_self(); jmp_buf env; @@ -3065,7 +3066,12 @@ switch_mutex_lock(session->mutex); while ((state = switch_channel_get_state(session->channel)) != CS_DONE) { - if (state != laststate) { + uint8_t exception = 0; + if (switch_channel_test_flag(session->channel, CF_REPEAT_STATE)) { + switch_channel_clear_flag(session->channel, CF_REPEAT_STATE); + exception = 1; + } + if (state != laststate || state == CS_HANGUP || exception) { int index = 0; int proceed = 1; midstate = state;

1 0

[commit] r4169 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 15:16:08 2007 New Revision: 4169 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_utils.c Log: make sofia set network_addr as the address the packet was actually received from, not the address from the uri. Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Feb 8 15:16:08 2007 @@ -94,6 +94,15 @@ */ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family); +/*! + \brief find the char representation of an ip adress + \param buf the buffer to write the ip adress found into + \param len the length of the buf + \param the struct in_addr * to get the adress from + \return the ip adress string +*/ +SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in); + #define SWITCH_STATUS_IS_BREAK(x) (x == SWITCH_STATUS_BREAK || x == 730035 || x == 35) /*! 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 Thu Feb 8 15:16:08 2007 @@ -74,6 +74,7 @@ #include <sofia-sip/su_md5.h> #include <sofia-sip/su_log.h> #include <sofia-sip/nea.h> +#include <sofia-sip/msg_addr.h> extern su_log_t tport_log[]; @@ -4173,7 +4174,7 @@ sip_unknown_t *un; private_object_t *tech_pvt = NULL; switch_channel_t *channel = NULL; - sip_from_t const *from = sip->sip_from; + sip_from_t const *from = sip->sip_from; sip_to_t const *to = sip->sip_to; char *displayname; char *username, *req_username = NULL; @@ -4184,8 +4185,9 @@ char *via_rport, *via_host, *via_port; char *from_port; char uri[1024]; + char network_ip[80]; + - if (!(sip && sip->sip_contact && sip->sip_contact->m_url)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); return; @@ -4212,6 +4214,9 @@ tech_pvt->key = switch_core_session_strdup(session, key); } + get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *)msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); + + to_user = (char *) to->a_url->url_user; to_host = (char *) to->a_url->url_host; if (!(to_port = (char *) to->a_url->url_port)) { @@ -4365,7 +4370,7 @@ profile->dialplan, displayname, (char *) from->a_url->url_user, - (char *) from->a_url->url_host, + network_ip, NULL, NULL, NULL, Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Feb 8 15:16:08 2007 @@ -36,7 +36,6 @@ #ifndef WIN32 #include <arpa/inet.h> #endif -static char *get_addr(char *buf, switch_size_t len, struct in_addr *in); SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) { @@ -348,7 +347,7 @@ static char RFC2833_CHARS[] = "0123456789*#ABCDF"; -static char *get_addr(char *buf, switch_size_t len, struct in_addr *in) +SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in) { uint8_t x, *i; char *p = buf;

1 0

[commit] r4168 - freeswitch/trunk/libs/udns
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 14:35:07 2007 New Revision: 4168 Modified: freeswitch/trunk/libs/udns/udns.h Log: missing ; Modified: freeswitch/trunk/libs/udns/udns.h ============================================================================== --- freeswitch/trunk/libs/udns/udns.h (original) +++ freeswitch/trunk/libs/udns/udns.h Thu Feb 8 14:35:07 2007 @@ -62,7 +62,7 @@ #include "winsock2.h" typedef SOCKET dns_socket; #else -typedef int dns_socket +typedef int dns_socket; #endif UDNS_API const char *

1 0

[commit] r4167 - in freeswitch/trunk: libs/udns src/mod/applications/mod_enum
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 14:23:36 2007 New Revision: 4167 Modified: freeswitch/trunk/libs/udns/udns.h freeswitch/trunk/libs/udns/udns_dn.c freeswitch/trunk/libs/udns/udns_parse.c freeswitch/trunk/libs/udns/udns_resolver.c freeswitch/trunk/libs/udns/udns_rr_txt.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: fix warnings and some windows compatibility issues in enum/udns Modified: freeswitch/trunk/libs/udns/udns.h ============================================================================== --- freeswitch/trunk/libs/udns/udns.h (original) +++ freeswitch/trunk/libs/udns/udns.h Thu Feb 8 14:23:36 2007 @@ -58,6 +58,13 @@ /**************************************************************************/ /**************** Common definitions **************************************/ +#ifdef WIN32 +#include "winsock2.h" +typedef SOCKET dns_socket; +#else +typedef int dns_socket +#endif + UDNS_API const char * dns_version(void); @@ -352,7 +359,7 @@ /* initialize default resolver context and open it if do_open is true. * <0 on failure. */ -UDNS_API int +UDNS_API dns_socket dns_init(int do_open); /* return new resolver context with the same settings as copy */ @@ -408,11 +415,11 @@ dns_set_dbgfn(struct dns_ctx *ctx, dns_dbgfn *dbgfn); /* open and return UDP socket */ -UDNS_API int +UDNS_API dns_socket dns_open(struct dns_ctx *ctx); /* return UDP socket or -1 if not open */ -UDNS_API int +UDNS_API dns_socket dns_sock(const struct dns_ctx *ctx); /* close the UDP socket */ Modified: freeswitch/trunk/libs/udns/udns_dn.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_dn.c (original) +++ freeswitch/trunk/libs/udns/udns_dn.c Thu Feb 8 14:23:36 2007 @@ -82,7 +82,7 @@ while(np < ne) { if (*np == '.') { /* label delimiter */ - c = dp - llab; /* length of the label */ + c = (unsigned)(dp - llab); /* length of the label */ if (!c) { /* empty label */ if (np == (dnscc_t *)name && np + 1 == ne) { /* special case for root dn, aka `.' */ @@ -131,7 +131,7 @@ *dp++ = (dnsc_t)c; /* place next out byte */ } - if ((c = dp - llab) > DNS_MAXLABEL) + if ((c = (unsigned)(dp - llab)) > DNS_MAXLABEL) return -1; /* label too long */ if ((llab[-1] = (dnsc_t)c) != 0) { *dp++ = 0; @@ -141,7 +141,7 @@ else if (isabs) *isabs = 1; - return dp - dn; + return (int)(dp - dn); } dnscc_t dns_inaddr_arpa_dn[14] = "\07in-addr\04arpa"; @@ -169,7 +169,7 @@ if (p > dne) return 0; *p = n + '0'; } - *dn = p - dn; + *dn = (dnsc_t)(p - dn); dn = p + 1; } return dn; @@ -187,7 +187,7 @@ l = dns_dnlen(tdn); if (p + l > dne) return dnsiz >= DNS_MAXDN ? -1 : 0; memcpy(p, tdn, l); - return (p + l) - dn; + return (int)((p + l) - dn); } int dns_a4ptodn(const struct in_addr *addr, const char *tname, @@ -232,7 +232,7 @@ l = dns_dnlen(tdn); if (p + l > dne) return dnsiz >= DNS_MAXDN ? -1 : 0; memcpy(p, tdn, l); - return (p + l) - dn; + return (int)((p + l) - dn); } int dns_a6ptodn(const struct in6_addr *addr, const char *tname, @@ -331,7 +331,7 @@ } if (np >= ne) goto toolong; *np++ = '\0'; - return np - name; + return (int)(np - name); toolong: return namesiz >= DNS_MAXNAME ? -1 : 0; } Modified: freeswitch/trunk/libs/udns/udns_parse.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_parse.c (original) +++ freeswitch/trunk/libs/udns/udns_parse.c Thu Feb 8 14:23:36 2007 @@ -60,7 +60,7 @@ *dp++ = 0; /* return next pos: either after the first jump or current */ *cur = jump ? jump : pp; - return dp - dn; + return (int)(dp - dn); } if (c & 192) { /* jump */ if (pp >= end) /* eop instead of jump pos */ Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Thu Feb 8 14:23:36 2007 @@ -22,6 +22,18 @@ */ #ifdef WIN32 +#ifdef _MSC_VER +#if (_MSC_VER >= 1400) // VC8+ +#ifndef _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE +#endif +#ifndef _CRT_NONSTDC_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE +#endif +#endif // VC8+ +#include "inet_pton.h" +#include "process.h" +#endif # include <winsock2.h> /* includes <windows.h> */ # include <ws2tcpip.h> /* needed for struct in6_addr */ # include <iphlpapi.h> /* for dns server addresses etc */ @@ -187,7 +199,7 @@ /* dynamic data */ unsigned short dnsc_nextid; /* next queue ID to use */ - int dnsc_udpsock; /* UDP socket */ + dns_socket dnsc_udpsock; /* UDP socket */ struct dns_qlink dnsc_qactive; /* active list sorted by deadline */ int dnsc_nactive; /* number entries in dnsc_qactive */ dnsc_t *dnsc_pbuf; /* packet buffer (udpbuf size) */ @@ -225,7 +237,14 @@ #define SETCTXFRESH(ctx) SETCTXINITED(ctx); assert(!CTXOPEN(ctx)) #define SETCTXINACTIVE(ctx) SETCTXINITED(ctx); assert(qlist_empty(&ctx->dnsc_qactive)) #define SETCTXOPEN(ctx) SETCTXINITED(ctx); assert(CTXOPEN(ctx)) +#ifdef WIN32 +#define CTXOPEN(ctx) (ctx->dnsc_udpsock != INVALID_SOCKET ) +#else #define CTXOPEN(ctx) (ctx->dnsc_udpsock >= 0) +#ifndef INVALID_SOCKET +#define INVALID_SOCKET -1 +#endif +#endif #if defined(NDEBUG) || !defined(DEBUG) #define dns_assert_ctx(ctx) @@ -321,7 +340,7 @@ } static void dns_set_opts_internal(struct dns_ctx *ctx, const char *opts) { - unsigned i, v; + size_t i, v; for(;;) { while(ISSPACE(*opts)) ++opts; if (!*opts) break; @@ -337,7 +356,7 @@ while (*opts >= '0' && *opts <= '9'); if (dns_opts[i].min && v < dns_opts[i].min) v = dns_opts[i].min; else if (v > dns_opts[i].max) v = dns_opts[i].max; - dns_ctxopt(ctx, dns_opts[i].offset) = v; + dns_ctxopt(ctx, dns_opts[i].offset) = (unsigned)v; break; } while(*opts && !ISSPACE(*opts)) ++opts; @@ -420,7 +439,7 @@ else if (!now || q->dnsq_deadline <= now) deadline = 0, timeout = 0; else - deadline = q->dnsq_deadline, timeout = deadline - now; + deadline = q->dnsq_deadline, timeout = (int)(deadline - now); if (ctx->dnsc_utmexp == deadline) return; ctx->dnsc_utmfn(ctx, timeout, ctx->dnsc_utmctx); @@ -608,10 +627,10 @@ static void dns_firstid(struct dns_ctx *ctx) { struct timeval tv; gettimeofday(&tv, NULL); - ctx->dnsc_nextid = (tv.tv_usec ^ getpid()) & 0xffff; + ctx->dnsc_nextid = (unsigned short)((tv.tv_usec ^ getpid()) & 0xffff); } -int dns_init(int do_open) { +dns_socket dns_init(int do_open) { struct dns_ctx *ctx = &dns_defctx; assert(!CTXINITED(ctx)); memset(ctx, 0, sizeof(*ctx)); @@ -620,7 +639,7 @@ ctx->dnsc_ndots = 1; ctx->dnsc_udpbuf = DNS_EDNS0PACKET; ctx->dnsc_port = DNS_PORT; - ctx->dnsc_udpsock = -1; + ctx->dnsc_udpsock = INVALID_SOCKET; qlist_init(&ctx->dnsc_qactive); if (dns_init_internal(ctx) != 0) return -1; @@ -637,7 +656,7 @@ if (!n) return NULL; *n = *ctx; - n->dnsc_udpsock = -1; + n->dnsc_udpsock = INVALID_SOCKET; qlist_init(&n->dnsc_qactive); n->dnsc_nactive = 0; n->dnsc_pbuf = NULL; @@ -665,8 +684,8 @@ memset(ctx, 0, sizeof(*ctx)); } -int dns_open(struct dns_ctx *ctx) { - int sock; +dns_socket dns_open(struct dns_ctx *ctx) { + dns_socket sock; unsigned i; int port; union sockaddr_ns *sns; @@ -768,12 +787,12 @@ SETCTXINITED(ctx); if (ctx->dnsc_udpsock < 0) return; closesocket(ctx->dnsc_udpsock); - ctx->dnsc_udpsock = -1; + ctx->dnsc_udpsock = INVALID_SOCKET; free(ctx->dnsc_pbuf); ctx->dnsc_pbuf = NULL; } -int dns_sock(const struct dns_ctx *ctx) { +dns_socket dns_sock(const struct dns_ctx *ctx) { SETCTXINITED(ctx); return ctx->dnsc_udpsock; } @@ -983,7 +1002,7 @@ q->dnsq_buf[DNS_H_ARCNT2] = 1; } assert(p <= q->dnsq_buf + DNS_QBUF); - q->dnsq_len = p - q->dnsq_buf; + q->dnsq_len = (unsigned)(p - q->dnsq_buf); qlist_add_head(q, &ctx->dnsc_qactive); ++ctx->dnsc_nactive; @@ -1248,7 +1267,7 @@ dns_request_utm(ctx, now); if (!q) return maxwait; - w = q->dnsq_deadline - now; + w = (int)(q->dnsq_deadline - now); return maxwait < 0 || maxwait > w ? w : maxwait; } @@ -1306,7 +1325,7 @@ tv.tv_sec = n; tv.tv_usec = 0; FD_SET(ctx->dnsc_udpsock, &rfd); - n = select(ctx->dnsc_udpsock + 1, &rfd, NULL, NULL, &tv); + n = select((int)(ctx->dnsc_udpsock + 1), &rfd, NULL, NULL, &tv); #endif now = time(NULL); if (n > 0) Modified: freeswitch/trunk/libs/udns/udns_rr_txt.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_rr_txt.c (original) +++ freeswitch/trunk/libs/udns/udns_rr_txt.c Thu Feb 8 14:23:36 2007 @@ -75,7 +75,7 @@ sp += l; cp += l; } - ret->dnstxt_txt[r].len = sp - ret->dnstxt_txt[r].txt; + ret->dnstxt_txt[r].len = (int)(sp - ret->dnstxt_txt[r].txt); *sp++ = '\0'; } dns_stdrr_finish((struct dns_rr_null *)ret, (char*)sp, &p); Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Thu Feb 8 14:23:36 2007 @@ -423,7 +423,8 @@ char *name = NULL; enum_query_t query = {0}; enum dns_type l_qtyp = DNS_T_NAPTR; - int i = 0, fd = -1, abs = 0; + int i = 0, abs = 0; + dns_socket fd = (dns_socket)-1; fd_set fds; struct timeval tv = {0}; time_t now = 0; @@ -484,7 +485,7 @@ #endif tv.tv_sec = i; tv.tv_usec = 0; - i = select(fd+1, &fds, 0, 0, &tv); + i = select((int)(fd+1), &fds, 0, 0, &tv); now = time(NULL); if (i > 0) dns_ioevent(nctx, now); } @@ -500,7 +501,7 @@ if (fd > -1) { closesocket(fd); - fd = -1; + fd = (dns_socket)-1; } if (nctx) {

1 0

[commit] r4166 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 13:10:21 2007 New Revision: 4166 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: don't print null in show commands return values. 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 Thu Feb 8 13:10:21 2007 @@ -590,9 +590,9 @@ for(x = 0; x < argc; x++) { if (holder->http) { holder->stream->write_function(holder->stream, "<td>"); - holder->stream->write_function(holder->stream, "%s%s", argv[x], x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); + holder->stream->write_function(holder->stream, "%s%s", argv[x] ? argv[x] : "", x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); } else { - holder->stream->write_function(holder->stream, "%s%s", argv[x], x == (argc - 1) ? "\n" : ","); + holder->stream->write_function(holder->stream, "%s%s", argv[x] ? argv[x] : "", x == (argc - 1) ? "\n" : ","); } }

1 0

[commit] r4165 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: anthm Date: Thu Feb 8 10:39:14 2007 New Revision: 4165 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: insist on a conference profile Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Feb 8 10:39:14 2007 @@ -3022,6 +3022,14 @@ if ((profiles = switch_xml_child(cfg, "profiles"))) { xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } + + if (!xml_cfg.profile) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); + switch_xml_free(cxml); + cxml = NULL; + goto done; + } + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT xml_cfg.menus = switch_xml_child(cfg, "menus"); @@ -3662,6 +3670,13 @@ xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } + if (!xml_cfg.profile) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); + switch_xml_free(cxml); + cxml = NULL; + goto done; + } + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT xml_cfg.menus = switch_xml_child(cfg, "menus");

1 0

[commit] r4164 - freeswitch/trunk/src
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: anthm Date: Thu Feb 8 10:09:51 2007 New Revision: 4164 Modified: freeswitch/trunk/src/switch_buffer.c Log: update Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Thu Feb 8 10:09:51 2007 @@ -144,10 +144,9 @@ reading = buffer->used; } - memmove(buffer->data, buffer->data + reading, reading); - buffer->head = buffer->data; - buffer->used -= reading; - buffer->actually_used = buffer->used; + buffer->used -= reading; + buffer->head += reading; + return buffer->used; }

1 0

[commit] r4163 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/applications/mod_dptools mod/endpoints/mod_dingaling mod/endpoints/mod_sofia
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 08:50:28 2007 New Revision: 4163 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: Fix typo in several places. Patch from Matt Klein. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Feb 8 08:50:28 2007 @@ -4039,7 +4039,7 @@ } if (!(ci = switch_loadable_module_get_chat_interface(proto))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto); } Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Feb 8 08:50:28 2007 @@ -396,7 +396,7 @@ ci->chat_send("dp", argv[1], argv[2], "", argv[3], ""); stream->write_function(stream, "Sent"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", argv[0]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", argv[0]); } } else { stream->write_function(stream, "Invalid"); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 8 08:50:28 2007 @@ -2296,7 +2296,7 @@ if ((ci = switch_loadable_module_get_chat_interface(proto))) { ci->chat_send(MDL_CHAT_PROTO, from, to, subject, msg, hint); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto); } switch_safe_free(pproto); 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 Thu Feb 8 08:50:28 2007 @@ -2633,7 +2633,7 @@ if ((ci = switch_loadable_module_get_chat_interface(proto))) { ci->chat_send(SOFIA_CHAT_PROTO, from_addr, to_addr, "", msg, full_from); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto ? proto : "(none)"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto ? proto : "(none)"); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Feb 8 08:50:28 2007 @@ -4740,7 +4740,7 @@ si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), args); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid SAY Interface [%s]!\n", lang); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", lang); } } else if (!strcasecmp(func, "speak-text")) { switch_codec_t *read_codec;

1 0

[commit] r4162 - freeswitch/branches/anthonyl/fs-branch/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: anthonyl Date: Thu Feb 8 04:56:34 2007 New Revision: 4162 Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/endpoints/mod_sofia/mod_sofia.c Log: oops. Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/anthonyl/fs-branch/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/anthonyl/fs-branch/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Feb 8 04:56:34 2007 @@ -5055,7 +5055,7 @@ if (profile->transport_udp && profile->transport_tcp) { snprintf(bindurl, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); } else { - snprintf(bindurl, sizeof(url), "sip:mod_sofia@%s:%d;transport=udp", profile->sipip, profile->sip_port, profile->transport_udp ? "udp":"tcp"); + snprintf(bindurl, sizeof(url), "sip:mod_sofia@%s:%d;transport=%s", profile->sipip, profile->sip_port, profile->transport_udp ? "udp":"tcp"); } profile->url = switch_core_strdup(profile->pool, url); profile->bindurl = switch_core_strdup(profile->pool, bindurl);

1 0