- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2279 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 13 Aug '06

13 Aug '06

Author: mikej Date: Sun Aug 13 00:41:40 2006 New Revision: 2279 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp Log: make mod cdr work on windows, and make it segfault less. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Sun Aug 13 00:41:40 2006 @@ -82,49 +82,55 @@ callanswerdate = newchannel->timetable->answered; callenddate = newchannel->timetable->hungup; - if(newchannel->callerprofile->caller_id_name != 0) - { - strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); - strncat(clid," <",2); - if(newchannel->callerprofile->caller_id_number != 0 ) - strncat(clid,newchannel->callerprofile->caller_id_number,strlen(clid)+strlen(newchannel->callerprofile->caller_id_number)); - strncat(clid,">",1); - } + if (newchannel->callerprofile) { + if(newchannel->callerprofile->caller_id_name != 0) + { + strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); + strncat(clid," <",2); + if(newchannel->callerprofile->caller_id_number != 0 ) + strncat(clid,newchannel->callerprofile->caller_id_number,strlen(clid)+strlen(newchannel->callerprofile->caller_id_number)); + strncat(clid,">",1); + } + + // Get the ANI information if it's set + if(newchannel->callerprofile->ani != 0) + strncpy(ani,newchannel->callerprofile->ani,strlen(newchannel->callerprofile->ani)); + if(newchannel->callerprofile->ani2 != 0) + strncpy(ani2,newchannel->callerprofile->ani2,strlen(newchannel->callerprofile->ani2)); - // Get the ANI information if it's set - if(newchannel->callerprofile->ani != 0) - strncpy(ani,newchannel->callerprofile->ani,strlen(newchannel->callerprofile->ani)); - if(newchannel->callerprofile->ani2 != 0) - strncpy(ani2,newchannel->callerprofile->ani2,strlen(newchannel->callerprofile->ani2)); - - if(newchannel->callerprofile->dialplan != 0) - strncpy(dialplan,newchannel->callerprofile->dialplan,strlen(newchannel->callerprofile->dialplan)); - - if(newchannel->callerprofile->network_addr != 0) - strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); - + if(newchannel->callerprofile->dialplan != 0) + strncpy(dialplan,newchannel->callerprofile->dialplan,strlen(newchannel->callerprofile->dialplan)); + + if(newchannel->callerprofile->network_addr != 0) + strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); + } + originated = newchannel->originate; - if(newchannel->originateprofile->uuid != 0) + if(newchannel->originateprofile && newchannel->originateprofile->uuid != 0) strncpy(destuuid,newchannel->originateprofile->uuid,strlen(newchannel->originateprofile->uuid)); // We still need to check if this is originated or not if(originated == 0) { - if(newchannel->callerprofile->destination_number != 0) - strncpy(src,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); - if(newchannel->callerprofile->caller_id_number != 0) - strncpy(dst,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); - if(newchannel->originateprofile->chan_name != 0) + if (newchannel->callerprofile) { + if(newchannel->callerprofile->destination_number != 0) + strncpy(src,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); + if(newchannel->callerprofile->caller_id_number != 0) + strncpy(dst,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); + } + if(newchannel->originateprofile && newchannel->originateprofile->chan_name != 0) strncpy(dstchannel,newchannel->originateprofile->chan_name,strlen(newchannel->originateprofile->chan_name)); } else { - if(newchannel->callerprofile->caller_id_number != 0) - strncpy(src,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); - if(newchannel->callerprofile->destination_number != 0) - strncpy(dst,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); - if(newchannel->originateprofile->chan_name != 0) + if (newchannel->callerprofile) { + if(newchannel->callerprofile->caller_id_number != 0) + strncpy(src,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); + if(newchannel->callerprofile->destination_number != 0) + strncpy(dst,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); + } + if(newchannel->originateprofile && newchannel->originateprofile->chan_name != 0) strncpy(dstchannel,newchannel->originateprofile->chan_name,strlen(newchannel->originateprofile->chan_name)); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp Sun Aug 13 00:41:40 2006 @@ -65,7 +65,7 @@ // Format the times apr_size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile - char format[] = "%F %T"; + char format[] = "%Y-%m-%d-%H-%M-%S"; switch_strftime(formattedcallstartdate,&retsizecsd,sizeof(formattedcallstartdate),format,&tempcallstart); switch_strftime(formattedcallanswerdate,&retsizecad,sizeof(formattedcallanswerdate),format,&tempcallanswer); switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend); @@ -193,7 +193,7 @@ switch_time_exp_lt(&now_converted,now); apr_size_t retsize; - char format[] = "%F %T"; + char format[] = "%Y-%m-%d-%H-%M-%S"; char formatteddate[100]; memset(formatteddate,0,100); switch_strftime(formatteddate,&retsize,100,format,&now_converted); Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp Sun Aug 13 00:41:40 2006 @@ -60,7 +60,7 @@ // Format the times size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile - char format[] = "%F %T"; + char format[] = "%Y-%m-%d-%H-%M-%S"; switch_strftime(formattedcallstartdate,&retsizecsd,sizeof(formattedcallstartdate),format,&tempcallstart); switch_strftime(formattedcallanswerdate,&retsizecad,sizeof(formattedcallanswerdate),format,&tempcallanswer); switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend);

1 0

[commit] r2276 - freeswitch/trunk/src
by Freeswitch SVN 12 Aug '06

12 Aug '06

Author: anthm Date: Sat Aug 12 18:39:02 2006 New Revision: 2276 Modified: freeswitch/trunk/src/switch_ivr.c Log: windows play file thing (please test mike) Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Aug 12 18:39:02 2006 @@ -453,6 +453,7 @@ SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); + write_frame.codec = &codec; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", @@ -492,7 +493,7 @@ int do_speed = 1; int last_speed = -1; switch_event_t *event; - + if (input_callback || buf) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback @@ -590,10 +591,12 @@ write_frame.datalen = (uint32_t)(olen * 2); write_frame.samples = (uint32_t)olen; + +#ifndef WIN32 #if __BYTE_ORDER == __BIG_ENDIAN switch_swap_linear(write_frame.data, (int) write_frame.datalen / 2); #endif - +#endif for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) { status = switch_core_session_write_frame(session, &write_frame, -1, stream_id);

1 0

[commit] r2272 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 12 Aug '06

12 Aug '06

Author: anthm Date: Sat Aug 12 13:09:11 2006 New Revision: 2272 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: update roster nonsense Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sat Aug 12 13:09:11 2006 @@ -427,6 +427,10 @@ struct ldl_buffer *buffer; size_t x; + iks *msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); + apr_queue_push(handle->queue, msg); + + apr_cpystrn(id, from, sizeof(id)); if ((resource = strchr(id, '/'))) { *resource++ = '\0'; @@ -490,8 +494,41 @@ if (!strcasecmp(iks_name(tag), "bind")) { char *jid = iks_find_cdata(tag, "jid"); char *resource = strchr(jid, '/'); + iks *iq, *usersetting, *x; handle->acc->resource = apr_pstrdup(handle->pool, resource); handle->login = apr_pstrdup(handle->pool, jid); + if ((iq = iks_new("iq"))) { + char *njid = strdup(handle->login); + if ((resource = strchr(njid, '/'))) { + *resource++ = '\0'; + } + iks_insert_attrib(iq, "type", "set"); + iks_insert_attrib(iq, "to", njid); + iks_insert_attrib(iq, "id", "params"); + + usersetting = iks_insert(iq, "usersetting"); + iks_insert_attrib(usersetting, "xmlns", "google:setting"); + x = iks_insert(usersetting, "autoacceptrequests"); + iks_insert_attrib(x, "value", "true"); + x = iks_insert(usersetting, "mailnotifications"); + iks_insert_attrib(x, "value", "false"); + free(njid); + iks_send(handle->parser, iq); + iks_delete(iq); + if ((iq = iks_new("iq"))) { + iks_insert_attrib(iq, "type", "get"); + iks_insert_attrib(iq, "id", "roster"); + x = iks_insert(iq, "query"); + iks_insert_attrib(x, "xmlns", "jabber:iq:roster"); + iks_insert_attrib(x, "xmlns:gr", "google:roster"); + iks_insert_attrib(x, "gr:ext", "2"); + iks_insert_attrib(x, "gr:include", "all"); + iks_send(handle->parser, iq); + iks_delete(iq); + } + + + } break; } tag = iks_next_tag(tag);

1 0

[commit] r2267 - freeswitch/trunk/src/include
by Freeswitch SVN 12 Aug '06

12 Aug '06

Author: mikej Date: Fri Aug 11 20:38:51 2006 New Revision: 2267 Modified: freeswitch/trunk/src/include/switch_utils.h Log: fix typo. Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Aug 11 20:38:51 2006 @@ -61,7 +61,7 @@ !strcasecmp(expr, "true") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE -#define SWITCH_STATUS_IS_BREAK(x) (x || SWITCH_STATUS_BREAK || x == 730035 || x == 35) +#define SWITCH_STATUS_IS_BREAK(x) (x || x == SWITCH_STATUS_BREAK || x == 730035 || x == 35) /*! \brief Return a printable name of a switch_priority_t

1 0

[commit] r2266 - in freeswitch/trunk/src: . mod/endpoints/mod_exosip
by Freeswitch SVN 11 Aug '06

11 Aug '06

Author: anthm Date: Fri Aug 11 19:27:08 2006 New Revision: 2266 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_rtp.c Log: rtp fix and some other misc stuff Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Fri Aug 11 19:27:08 2006 @@ -586,7 +586,9 @@ } } else { switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP REPORTS ERROR: [%s]\n", err); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP REPORTS ERROR: [%s][%s:%d]\n", err, + tech_pvt->local_sdp_audio_ip, + tech_pvt->local_sdp_audio_port); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_clear_flag_locked(tech_pvt, TFLAG_IO); Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Aug 11 19:27:08 2006 @@ -84,10 +84,6 @@ nice(-20); #endif -#ifdef HAVE_MLOCKALL - mlockall(MCL_CURRENT|MCL_FUTURE); -#endif - #ifndef WIN32 if (argv[1] && !strcmp(argv[1], "-stop")) { pid_t pid = 0; @@ -181,6 +177,11 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Ready"); switch_event_fire(&event); } + +#ifdef HAVE_MLOCKALL + mlockall(MCL_CURRENT|MCL_FUTURE); +#endif + #ifdef CRASH_PROT #define __CP "ENABLED" Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Aug 11 19:27:08 2006 @@ -298,8 +298,8 @@ switch_mutex_lock(port_lock); port = NEXT_PORT; NEXT_PORT += 2; - if (port > RTP_END_PORT) { - port = RTP_START_PORT; + if (NEXT_PORT > RTP_END_PORT) { + NEXT_PORT = RTP_START_PORT; } switch_mutex_unlock(port_lock); return port;

1 0

[commit] r2263 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 11 Aug '06

11 Aug '06

Author: anthm Date: Fri Aug 11 14:59:25 2006 New Revision: 2263 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: more socket stuff Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Aug 11 14:59:25 2006 @@ -254,6 +254,7 @@ if (*mbuf == '\r' || *mbuf == '\n') { /* bah */ ptr = mbuf; + mbuf[0] = '\0'; continue; } @@ -460,6 +461,9 @@ snprintf(reply, reply_len, "-ERR invalid log level"); } } else if (!strncasecmp(cmd, "nolog", 5)) { + void *pop; + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); + if (switch_test_flag(listener, LFLAG_LOG)) { switch_clear_flag_locked(listener, LFLAG_LOG); snprintf(reply, reply_len, "+OK no longer logging"); @@ -519,6 +523,9 @@ snprintf(reply, reply_len, "+OK event listener enabled %s", listener->format == EVENT_FORMAT_XML ? "xml" : "plain"); } else if (!strncasecmp(cmd, "noevents", 8)) { + void *pop; + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS); + if (switch_test_flag(listener, LFLAG_EVENTS)) { uint8_t x = 0; switch_clear_flag_locked(listener, LFLAG_EVENTS);

1 0

[commit] r2260 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 11 Aug '06

11 Aug '06

Author: anthm Date: Fri Aug 11 14:20:04 2006 New Revision: 2260 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: socket tweak Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Aug 11 14:20:04 2006 @@ -31,8 +31,8 @@ */ #include <switch.h> #define CMD_BUFLEN 1024 * 1000 +#define IS_BREAK(x) ((int)x || SWITCH_STATUS_BREAK || (int)x == 730035 || (int)x == 35) - static const char modname[] = "mod_event_socket"; static char *MARKER = "1"; @@ -244,12 +244,13 @@ mlen = 1; status = switch_socket_recv(listener->sock, ptr, &mlen); - if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS) { - return status; + if (!SWITCH_STATUS_IS_BREAK(status) && status != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; } - if (status != SWITCH_STATUS_BREAK && mlen) { + if (mlen) { bytes++; + do_sleep = 0; if (*mbuf == '\r' || *mbuf == '\n') { /* bah */ ptr = mbuf; @@ -303,7 +304,7 @@ return SWITCH_STATUS_FALSE; } } - + if (!*mbuf) { if (switch_test_flag(listener, LFLAG_LOG)) { if (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r2258 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 11 Aug '06

11 Aug '06

Author: mikej Date: Fri Aug 11 12:24:06 2006 New Revision: 2258 Modified: freeswitch/trunk/libs/iax/src/iax.c Log: Make iax work with plaintext passwords too. Thanks to Michael Workman for the patch. Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Fri Aug 11 12:24:06 2006 @@ -1785,7 +1785,7 @@ convert_reply(realreply, (unsigned char *) reply); iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, (unsigned char *) realreply); } else { - iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, (unsigned char *) password); + iax_ie_append_str(&ied, IAX_IE_PASSWORD, (unsigned char *) password); } return send_command(session, AST_FRAME_IAX, IAX_COMMAND_AUTHREP, 0, ied.buf, ied.pos, -1); } @@ -1808,7 +1808,7 @@ convert_reply(realreply, (unsigned char *) reply); iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, (unsigned char *) realreply); } else { - iax_ie_append_str(&ied, IAX_IE_MD5_RESULT, (unsigned char *) password); + iax_ie_append_str(&ied, IAX_IE_PASSWORD, (unsigned char *) password); } return send_command(session, AST_FRAME_IAX, IAX_COMMAND_REGREQ, 0, ied.buf, ied.pos, -1); } @@ -2244,7 +2244,7 @@ /* How many ms from now should this packet be delivered? (remember this can be a negative number, too */ - ms = calc_rxstamp(e->session) - ts; + ms = (int)(calc_rxstamp(e->session) - ts); /* Drop voice frame if timestamp is way off

1 0

[commit] r2257 - in freeswitch/trunk/src: include mod/event_handlers/mod_event_socket
by Freeswitch SVN 11 Aug '06

11 Aug '06

Author: anthm Date: Fri Aug 11 11:25:49 2006 New Revision: 2257 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: socket code Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Aug 11 11:25:49 2006 @@ -61,6 +61,8 @@ !strcasecmp(expr, "true") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +#define SWITCH_STATUS_IS_BREAK(x) (x || SWITCH_STATUS_BREAK || x == 730035 || x == 35) + /*! \brief Return a printable name of a switch_priority_t \param priority the priority to get the name of Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Aug 11 11:25:49 2006 @@ -244,7 +244,7 @@ mlen = 1; status = switch_socket_recv(listener->sock, ptr, &mlen); - if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS && status != 730035) { + if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS) { return status; }

1 0

[commit] r2256 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 11 Aug '06

11 Aug '06

Author: mikej Date: Fri Aug 11 11:01:48 2006 New Revision: 2256 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr.c Log: time_t cast. 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 Fri Aug 11 11:01:48 2006 @@ -2069,7 +2069,7 @@ break; } - if ((time(NULL) - start) > timelimit) { + if ((time(NULL) - start) > (time_t)timelimit) { break; } switch_yield(1000); @@ -2082,7 +2082,7 @@ while ((!caller_channel || switch_channel_ready(caller_channel)) && !switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) && - ((time(NULL) - start) < timelimit)) { + ((time(NULL) - start) < (time_t)timelimit)) { /* read from the channel while we wait if the audio is up on it */ if (session && (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Aug 11 11:01:48 2006 @@ -1203,7 +1203,7 @@ break; } - if ((time(NULL) - start) > timelimit) { + if ((time(NULL) - start) > (time_t)timelimit) { break; } switch_yield(1000); @@ -1216,7 +1216,7 @@ switch_channel_ready(peer_channel) && !switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) && - ((time(NULL) - start) < timelimit)) { + ((time(NULL) - start) < (time_t)timelimit)) { /* read from the channel while we wait if the audio is up on it */ if (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {

1 0