- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4453 - in freeswitch/trunk/src: . include
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: anthm Date: Mon Mar 5 15:55:41 2007 New Revision: 4453 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_event.c Log: add TRAP event Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 5 15:55:41 2007 @@ -816,6 +816,7 @@ SWITCH_EVENT_DETECTED_SPEECH - Detected Speech SWITCH_EVENT_PRIVATE_COMMAND - A private command event SWITCH_EVENT_HEARTBEAT - Machine is alive + SWITCH_EVENT_TRAP - Error Trap SWITCH_EVENT_ALL - All events at once </pre> @@ -857,6 +858,7 @@ SWITCH_EVENT_DETECTED_SPEECH, SWITCH_EVENT_PRIVATE_COMMAND, SWITCH_EVENT_HEARTBEAT, + SWITCH_EVENT_TRAP, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 5 15:55:41 2007 @@ -132,6 +132,7 @@ "DETECTED_SPEECH", "PRIVATE_COMMAND", "HEARTBEAT", + "TRAP", "ALL" };

1 0

[commit] r4452 - in freeswitch/trunk: libs/iax/src src src/include src/mod/applications/mod_conference src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia src/mod/timers/mod_softtimer
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: anthm Date: Mon Mar 5 15:53:54 2007 New Revision: 4452 Modified: freeswitch/trunk/libs/iax/src/Makefile.in freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_rtp.c Log: change a few things to allow timers to generate timestamps Modified: freeswitch/trunk/libs/iax/src/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iax/src/Makefile.in (original) +++ freeswitch/trunk/libs/iax/src/Makefile.in Mon Mar 5 15:53:54 2007 @@ -66,7 +66,8 @@ pkgLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pkg_LTLIBRARIES) libiax_la_LIBADD = -am_libiax_la_OBJECTS = iax2-parser.lo iax.lo md5.lo jitterbuf.lo +am_libiax_la_OBJECTS = iax2-parser.lo iax.lo md5.lo jitterbuf.lo \ + iax-mutex.lo libiax_la_OBJECTS = $(am_libiax_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp @@ -196,9 +197,9 @@ AM_LDFLAGS = $(new_AM_LDFLAGS) pkgdir = $(libdir) pkg_LTLIBRARIES = libiax.la -libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c +libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c iax-mutex.c library_includedir = $(prefix)/include/iax -library_include_HEADERS = md5.h frame.h iax-client.h iax2.h iax2-parser.h iax.h +library_include_HEADERS = md5.h frame.h iax-client.h iax2.h iax2-parser.h iax.h iax-mutex.h noinst_HEADERS = jitterbuf.h all: all-am @@ -269,6 +270,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iax-mutex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iax.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iax2-parser.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterbuf.Plo@am__quote@ Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Mon Mar 5 15:53:54 2007 @@ -63,7 +63,7 @@ /*! the payload of the frame */ switch_payload_t payload; /*! the timestamp of the frame */ - uint32_t timestamp; + switch_size_t timestamp; /*! frame flags */ switch_frame_flag_t flags; }; Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon Mar 5 15:53:54 2007 @@ -225,7 +225,7 @@ /*! sample count to increment by on each cycle */ unsigned int samples; /*! current sample count based on samples parameter */ - unsigned int samplecount; + switch_size_t samplecount; /*! the timer interface provided from a loadable module */ switch_timer_interface_t *timer_interface; /*! the timer's memory pool */ 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 Mon Mar 5 15:53:54 2007 @@ -1619,6 +1619,7 @@ if (member->volume_out_level) { switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); } + write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); /* forget the conference data we played file node data instead */ @@ -1648,6 +1649,7 @@ switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); } + write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); } } 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 Mon Mar 5 15:53:54 2007 @@ -147,7 +147,7 @@ unsigned int cand_id; unsigned int desc_id; unsigned int dc; - int32_t timestamp_send; + switch_size_t timestamp_send; int32_t timestamp_recv; uint32_t last_read; char *codec_name; @@ -1356,12 +1356,12 @@ } samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; - - if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, samples) < 0) { + tech_pvt->timestamp_send += samples; + if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, (uint32_t)tech_pvt->timestamp_send) < 0) { terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } - tech_pvt->timestamp_send += (int) samples; + switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); 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 Mon Mar 5 15:53:54 2007 @@ -276,7 +276,7 @@ switch_codec_t write_codec; uint32_t codec_ms; switch_caller_profile_t *caller_profile; - int32_t timestamp_send; + switch_size_t timestamp_send; //int32_t timestamp_recv; switch_rtp_t *rtp_session; int ssrc; @@ -682,7 +682,6 @@ if (cbt.matches) { return val; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", user, host); return NULL; } } @@ -1881,9 +1880,8 @@ tech_pvt->timestamp_send); #endif - switch_rtp_write_frame(tech_pvt->rtp_session, frame, samples); - - tech_pvt->timestamp_send += (int) samples; + tech_pvt->timestamp_send += samples; + switch_rtp_write_frame(tech_pvt->rtp_session, frame, (uint32_t)tech_pvt->timestamp_send); switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); return status; @@ -2300,6 +2298,7 @@ tech_pvt->dest = switch_core_session_strdup(nsession, buf); } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; terminate_session(&nsession, cause, __LINE__); goto done; @@ -2311,6 +2310,7 @@ tech_pvt->dest = switch_core_session_strdup(nsession, buf); } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; terminate_session(&nsession, cause, __LINE__); goto done; Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Mar 5 15:53:54 2007 @@ -43,12 +43,12 @@ #define MAX_ELEMENTS 1000 struct timer_private { - uint64_t reference; + switch_size_t reference; }; typedef struct timer_private timer_private_t; struct timer_matrix { - uint64_t tick; + switch_size_t tick; uint32_t count; }; typedef struct timer_matrix timer_matrix_t; @@ -86,7 +86,9 @@ return SWITCH_STATUS_FALSE; } - private_info->reference += timer->interval; + timer->samplecount = timer->samples * private_info->reference; + private_info->reference++;// timer->interval; + return SWITCH_STATUS_SUCCESS; } @@ -101,8 +103,7 @@ switch_yield(1000); } - if (globals.RUNNING == 1) { - timer->samplecount += timer->samples; + if (globals.RUNNING == 1) { return SWITCH_STATUS_SUCCESS; } @@ -114,7 +115,7 @@ { timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; - uint64_t diff; + switch_size_t diff; if (globals.RUNNING != 1) { return SWITCH_STATUS_SUCCESS; @@ -210,7 +211,8 @@ index = (current_ms % i == 0) ? i : 0; if (TIMER_MATRIX[index].count) { - TIMER_MATRIX[index].tick += index; + //TIMER_MATRIX[index].tick += index; + TIMER_MATRIX[index].tick++; } } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 5 15:53:54 2007 @@ -2173,15 +2173,21 @@ &session->enc_read_frame.datalen, &session->enc_read_frame.rate, &flag); - + switch (status) { case SWITCH_STATUS_RESAMPLE: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 1\n"); case SWITCH_STATUS_SUCCESS: + session->enc_read_frame.codec = session->read_codec; + session->enc_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); + session->enc_read_frame.timestamp = read_frame->timestamp; *frame = &session->enc_read_frame; break; case SWITCH_STATUS_NOOP: + session->raw_read_frame.codec = session->read_codec; + session->raw_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); + session->raw_read_frame.timestamp = read_frame->timestamp; *frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; break; @@ -2439,9 +2445,16 @@ case SWITCH_STATUS_RESAMPLE: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 2\n"); case SWITCH_STATUS_SUCCESS: + session->enc_write_frame.codec = session->write_codec; + session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); + session->enc_write_frame.timestamp = frame->timestamp; write_frame = &session->enc_write_frame; break; case SWITCH_STATUS_NOOP: + enc_frame->codec = session->write_codec; + enc_frame->samples = enc_frame->datalen / sizeof(int16_t); + enc_frame->timestamp = frame->timestamp; + write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS; break; @@ -2486,21 +2499,30 @@ switch (status) { case SWITCH_STATUS_RESAMPLE: + session->enc_write_frame.codec = session->write_codec; + session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); + session->enc_write_frame.timestamp = frame->timestamp; + write_frame = &session->enc_write_frame; if (!session->read_resampler) { status = switch_resample_create(&session->read_resampler, frame->codec->implementation->samples_per_second, frame->codec->implementation->bytes_per_frame * 20, - session->write_codec->implementation-> - samples_per_second, - session->write_codec->implementation-> - bytes_per_frame * 20, session->pool); + session->write_codec->implementation->samples_per_second, + session->write_codec->implementation->bytes_per_frame * 20, + session->pool); } break; case SWITCH_STATUS_SUCCESS: + session->enc_write_frame.codec = session->write_codec; + session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); + session->enc_write_frame.timestamp = frame->timestamp; write_frame = &session->enc_write_frame; break; case SWITCH_STATUS_NOOP: + enc_frame->codec = session->write_codec; + enc_frame->samples = enc_frame->datalen / sizeof(int16_t); + enc_frame->timestamp = frame->timestamp; write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS; break; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Mar 5 15:53:54 2007 @@ -1417,7 +1417,9 @@ llen = olen; - + if (timer_name) { + write_frame.timestamp = timer.samplecount; + } #ifndef WIN32 #if __BYTE_ORDER == __BIG_ENDIAN if (!asis) {switch_swap_linear(write_frame.data, (int) write_frame.datalen / 2);} @@ -1689,6 +1691,10 @@ write_frame.codec = codec; for( x = 0; !done && x < lead_in_out; x++) { + switch_yield(codec->implementation->microseconds_per_frame); + if (timer) { + write_frame.timestamp = timer->samplecount; + } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; @@ -1771,6 +1777,10 @@ if (status != SWITCH_STATUS_SUCCESS) { for( x = 0; !done && x < lead_in_out; x++) { + switch_yield(codec->implementation->microseconds_per_frame); + if (timer) { + write_frame.timestamp = timer->samplecount; + } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; @@ -1789,7 +1799,9 @@ write_frame.datalen = (uint32_t)ilen; write_frame.samples = (uint32_t)(ilen / 2); - + if (timer) { + write_frame.timestamp = timer->samplecount; + } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 5 15:53:54 2007 @@ -1303,18 +1303,24 @@ SWITCH_DECLARE(int) switch_rtp_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint32_t ts, switch_frame_flag_t *flags) { + uint8_t mark = 0; if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } - rtp_session->ts += ts; + rtp_session->ts = ts; + + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size) { + mark++; + } + rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); rtp_session->send_msg.header.seq = rtp_session->seq; rtp_session->send_msg.header.ts = htonl(rtp_session->ts); - return rtp_common_write(rtp_session, data, datalen, 0, rtp_session->payload, flags); + return rtp_common_write(rtp_session, data, datalen, mark, rtp_session->payload, flags); } @@ -1324,6 +1330,7 @@ uint8_t packetize = (rtp_session->packet_size > frame->datalen && (frame->payload == rtp_session->payload)) ? 1 : 0; void *data; uint32_t len; + uint8_t mark = 0; if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; @@ -1335,14 +1342,24 @@ } else { data = frame->data; len = frame->datalen; - rtp_session->ts += ts; + + if (frame->timestamp) { + rtp_session->ts = (uint32_t) frame->timestamp; + } else { + rtp_session->ts = ts; + } + + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size) { + mark++; + } + rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); rtp_session->send_msg.header.seq = rtp_session->seq; rtp_session->send_msg.header.ts = htonl(rtp_session->ts); } - return rtp_common_write(rtp_session, data, len, 0, rtp_session->payload, &frame->flags); + return rtp_common_write(rtp_session, data, len, mark, rtp_session->payload, &frame->flags); }

1 0

[commit] r4450 - freeswitch/trunk/src
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: brian Date: Mon Mar 5 09:37:15 2007 New Revision: 4450 Modified: freeswitch/trunk/src/switch_swig.c Log: thanks dirks Modified: freeswitch/trunk/src/switch_swig.c ============================================================================== --- freeswitch/trunk/src/switch_swig.c (original) +++ freeswitch/trunk/src/switch_swig.c Mon Mar 5 09:37:15 2007 @@ -64,7 +64,7 @@ { switch_status_t status; - status = switch_core_destroy(0); + status = switch_core_destroy(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; }

1 0

[commit] r4449 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: mikej Date: Mon Mar 5 01:56:13 2007 New Revision: 4449 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: constification 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 Mon Mar 5 01:56:13 2007 @@ -3211,8 +3211,8 @@ const char *from_host = NULL; char contact_str[1024] = ""; char buf[512]; - char *passwd = NULL; - char *a1_hash = NULL; + const char *passwd = NULL; + const char *a1_hash = NULL; uint8_t stale = 0, ret = 0, forbidden = 0; auth_res_t auth_res; long exptime = 60; @@ -3329,10 +3329,8 @@ for (param = switch_xml_child(xparams, "param"); param; param = param->next) { - char *var = (char *) switch_xml_attr_soft(param, "name"); - char *val = (char *) switch_xml_attr_soft(param, "value"); - - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param [%s]=[%s]\n", var, val); + const char *var = switch_xml_attr_soft(param, "name"); + const char *val = switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "password")) { passwd = val;

1 0

[commit] r4448 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: mikej Date: Mon Mar 5 01:04:37 2007 New Revision: 4448 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add a bit more null handling in mod_sofia. 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 Mon Mar 5 01:04:37 2007 @@ -456,7 +456,7 @@ } -static auth_res_t parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, char *regstr, char *np, size_t nplen) +static auth_res_t parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen) { int indexnum; const char *cur; @@ -643,12 +643,17 @@ } -static char *find_reg_url(sofia_profile_t *profile, char *user, char *host, char *val, switch_size_t len) +static char *find_reg_url(sofia_profile_t *profile, const char *user, const char *host, char *val, switch_size_t len) { char *errmsg; struct callback_t cbt = {0}; switch_core_db_t *db; + if (!user) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Called with null user!\n"); + return NULL; + } + if (!(db = switch_core_db_open_file(profile->dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); return NULL; @@ -2594,20 +2599,21 @@ char hash_key[256] = ""; char buf[512]; - if (!sip || tech_pvt->hash_key) { + if (tech_pvt->hash_key || !sip || !sip->sip_from || + !sip->sip_from->a_url || + !sip->sip_from->a_url->url_user || + !sip->sip_from->a_url->url_host) { return; } - if (find_reg_url(tech_pvt->profile, (char *) sip->sip_from->a_url->url_user, (char *) sip->sip_from->a_url->url_host, buf, sizeof(buf))) { - tech_pvt->chat_from = sip_header_as_string(tech_pvt->home, (void *)sip->sip_to); + if (find_reg_url(tech_pvt->profile, sip->sip_from->a_url->url_user, sip->sip_from->a_url->url_host, buf, sizeof(buf))) { + tech_pvt->chat_from = sip_header_as_string(tech_pvt->home, (const sip_header_t *)sip->sip_to); tech_pvt->chat_to = switch_core_session_strdup(tech_pvt->session, buf); set_hash_key(hash_key, sizeof(hash_key), sip); } else { return; } - - tech_pvt->hash_key = switch_core_session_strdup(tech_pvt->session, hash_key); switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); @@ -3193,16 +3199,16 @@ char *key, uint32_t keylen) { - sip_from_t const *from = sip->sip_from; - sip_expires_t const *expires = sip->sip_expires; - sip_authorization_t const *authorization = sip->sip_authorization; - sip_contact_t const *contact = sip->sip_contact; + sip_from_t const *from = NULL; + sip_expires_t const *expires = NULL; + sip_authorization_t const *authorization = NULL; + sip_contact_t const *contact = NULL; switch_xml_t domain, xml, user, param, xparams; char params[1024] = ""; char *sql; switch_event_t *s_event; - char *from_user = (char *) from->a_url->url_user; - char *from_host = (char *) from->a_url->url_host; + const char *from_user = NULL; + const char *from_host = NULL; char contact_str[1024] = ""; char buf[512]; char *passwd = NULL; @@ -3214,8 +3220,27 @@ const char *rpid = "unknown"; const char *display = "\"user\""; - if (contact && contact->m_url) { - char *port = (char *) contact->m_url->url_port; + /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ + assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); + + expires = sip->sip_expires; + authorization = sip->sip_authorization; + contact = sip->sip_contact; + from = sip->sip_from; + + if (from) { + from_user = from->a_url->url_user; + from_host = from->a_url->url_host; + } + + if (!from_user || !from_host) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not do authorization without a complete from header\n"); + nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + return 1; + } + + if (contact->m_url) { + const char *port = contact->m_url->url_port; display = contact->m_display; if (switch_strlen_zero(display)) { @@ -3242,7 +3267,7 @@ if (expires) { exptime = expires->ex_delta; - } else if (contact && contact->m_expires) { + } else if (contact->m_expires) { exptime = atol(contact->m_expires); } @@ -3257,7 +3282,7 @@ } if (authorization) { - if ((auth_res = parse_auth(profile, authorization, (char *)sip->sip_request->rq_method_name, key, keylen)) == AUTH_STALE) { + if ((auth_res = parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen)) == AUTH_STALE) { stale = 1; } @@ -4358,12 +4383,13 @@ const char *context; char network_ip[80]; - if (!sip) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invite callback with no packet!\n"); + if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); return; } + if (!(sip->sip_contact && sip->sip_contact->m_url)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); nua_respond(nh, 400, "Missing Contact Header", TAG_END()); @@ -4426,7 +4452,7 @@ } } - if (sip->sip_request && sip->sip_request->rq_url) { + if (sip->sip_request->rq_url) { const char * req_uri = url_set_chanvars(session, sip->sip_request->rq_url, sip_req); if (profile->pflags & PFLAG_FULL_ID) { destination_number = req_uri; @@ -4540,6 +4566,19 @@ tagi_t tags[]) { char key[128] = ""; + + if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); + nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + return; + } + + if (!(sip->sip_contact && sip->sip_contact->m_url)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); + nua_respond(nh, 400, "Missing Contact Header", TAG_END()); + return; + } + handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key)); }

1 0

[commit] r4447 - in freeswitch/trunk/src: . include mod/xml_int/mod_xml_curl
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: mikej Date: Mon Mar 5 00:49:52 2007 New Revision: 4447 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/switch_xml.c Log: constify some xml functions Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 5 00:49:52 2007 @@ -1029,11 +1029,11 @@ typedef switch_status_t (*switch_module_shutdown_t) (void); typedef struct switch_xml *switch_xml_t; typedef struct switch_core_time_duration switch_core_time_duration_t; -typedef switch_xml_t (*switch_xml_search_function_t)(char *section, - char *tag_name, - char *key_name, - char *key_value, - char *params, +typedef switch_xml_t (*switch_xml_search_function_t)(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, + const char *params, void *user_data); /* things we don't deserve to know about */ Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Mon Mar 5 00:49:52 2007 @@ -316,20 +316,20 @@ ///\param node a pointer to the requested node ///\param params optional URL formatted params to pass to external gateways ///\return SWITCH_STATUS_SUCCESS if successful root and node will be assigned -SWITCH_DECLARE(switch_status_t) switch_xml_locate(char *section, - char *tag_name, - char *key_name, - char *key_value, +SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, switch_xml_t *root, switch_xml_t *node, - char *params); + const char *params); ///\brief open a config in the core registry ///\param file_path the name of the config section e.g. modules.conf ///\param node a pointer to point to the node if it is found ///\param params optional URL formatted params to pass to external gateways ///\return the root xml node associated with the current request or NULL -SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(char *file_path, switch_xml_t *node, char *params); +SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, const char *params); ///\brief bind a search function to an external gateway ///\param function the search function to bind @@ -342,7 +342,7 @@ ///\brief parse a string for a list of sections ///\param str a | delimited list of section names ///\return the section mask -SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str); +SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str); SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Mon Mar 5 00:49:52 2007 @@ -56,11 +56,11 @@ } -static switch_xml_t xml_url_fetch(char *section, - char *tag_name, - char *key_name, - char *key_value, - char *params, +static switch_xml_t xml_url_fetch(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, + const char *params, void *user_data) { char filename[512] = ""; Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Mar 5 00:49:52 2007 @@ -112,7 +112,7 @@ { NULL, 0} }; -SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str) +SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(const char *str) { size_t x; char buf[1024] = ""; @@ -950,12 +950,12 @@ int fd = -1, write_fd = -1; switch_xml_t xml = NULL; char *new_file = NULL; - char *abs; + const char *abs; if ((abs = strrchr(file, '/')) || (abs = strrchr(file, '\\'))) { abs++; } else { - abs = (char *)file; + abs = file; } if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) { @@ -991,13 +991,13 @@ } -SWITCH_DECLARE(switch_status_t) switch_xml_locate(char *section, - char *tag_name, - char *key_name, - char *key_value, +SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, + const char *tag_name, + const char *key_name, + const char *key_value, switch_xml_t *root, switch_xml_t *node, - char *params) + const char *params) { switch_xml_t conf = NULL; switch_xml_t tag = NULL; @@ -1154,7 +1154,7 @@ return SWITCH_STATUS_FALSE; } -SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(char *file_path, switch_xml_t *node, char *params) +SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, const char *params) { switch_xml_t xml = NULL, cfg = NULL;

1 0

[commit] r4446 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: mikej Date: Sun Mar 4 17:19:39 2007 New Revision: 4446 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: add color support to console in windows. Note, I don't like the colors I chose, if someone comes up with better ones, I'd be happy for the patch. Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Sun Mar 4 17:19:39 2007 @@ -34,8 +34,24 @@ static const char modname[] = "mod_console"; static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; static int COLORIZE = 0; +#ifdef WIN32 +static HANDLE hStdout; +static WORD wOldColorAttrs; +static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; +static WORD COLORS[] = + { FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_BLUE | FOREGROUND_INTENSITY, + FOREGROUND_BLUE | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY }; +#else static const char *COLORS[] = { SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" }; +#endif static switch_loadable_module_interface_t console_module_interface = { /*.module_name */ modname, @@ -109,7 +125,16 @@ char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "colorize") && switch_true(val)) { +#ifdef WIN32 + hStdout = GetStdHandle(STD_OUTPUT_HANDLE); + if (switch_core_get_console() == stdout && hStdout != INVALID_HANDLE_VALUE + && GetConsoleScreenBufferInfo(hStdout, &csbiInfo)) { + wOldColorAttrs = csbiInfo.wAttributes; + COLORIZE = 1; + } +#else COLORIZE = 1; +#endif } } } @@ -143,7 +168,13 @@ if (!log_hash || (((all_level > - 1) || lookup) && level >= node->level)) { if (COLORIZE) { +#ifdef WIN32 + SetConsoleTextAttribute(hStdout, COLORS[node->level]); + WriteFile(hStdout, node->data, (DWORD)strlen(node->data), NULL, NULL); + SetConsoleTextAttribute(hStdout, wOldColorAttrs); +#else fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR); +#endif } else { fprintf(handle, "%s", node->data); }

1 0

[commit] r4445 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:53:49 2007 New Revision: 4445 Modified: freeswitch/trunk/src/switch_utils.c Log: update comments Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sat Mar 3 20:53:49 2007 @@ -376,8 +376,9 @@ if ((r = apr_socket_recvfrom(from, sock, flags, buf, len)) == APR_SUCCESS) { from->port = ntohs(from->sa.sin.sin_port); - //from->ipaddr_ptr = &(from->sa.sin.sin_addr); - //from->ipaddr_ptr = inet_ntoa(from->sa.sin.sin_addr); + /* from->ipaddr_ptr = &(from->sa.sin.sin_addr); + * from->ipaddr_ptr = inet_ntoa(from->sa.sin.sin_addr); + */ } return r; @@ -647,7 +648,7 @@ #ifdef WIN32 -//this forces certain symbols to not be optimized out of the dll +/* this forces certain symbols to not be optimized out of the dll */ void include_me(void) { apr_socket_shutdown(NULL, 0);

1 0

[commit] r4444 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:52:52 2007 New Revision: 4444 Modified: freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_resample.c freeswitch/trunk/src/switch_rtp.c Log: update comments Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat Mar 3 20:52:52 2007 @@ -909,7 +909,7 @@ } else { status = SWITCH_STATUS_FALSE; stream->write_function(stream, "INVALID COMMAND [%s]", cmd); - //snprintf(retbuf, len, "INVALID COMMAND [%s]", cmd); + /* snprintf(retbuf, len, "INVALID COMMAND [%s]", cmd); */ } if (stream->event) { Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sat Mar 3 20:52:52 2007 @@ -88,7 +88,7 @@ int lastFlag = (last && (srcBlock == srclen - srcpos)); o = resample_process(resampler->resampler, resampler->factor, &src[srcpos], srcBlock, lastFlag, &srcused, &dst[out], dstlen - out); - //printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor); + /* printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor); */ srcpos += srcused; if (o >= 0) { @@ -169,7 +169,7 @@ for (i = 0; i < len; i++) { f[i] = (float) (s[i]) / NORMFACT; - //f[i] = (float) s[i]; + /* f[i] = (float) s[i]; */ } return len; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Mar 3 20:52:52 2007 @@ -228,7 +228,7 @@ } } while (switch_stun_packet_next_attribute(attr)); - //printf("[%s] [%s] [%s]\n", rtp_session->user_ice, username, !strcmp(rtp_session->user_ice, username) ? "yes" : "no"); + /* printf("[%s] [%s] [%s]\n", rtp_session->user_ice, username, !strcmp(rtp_session->user_ice, username) ? "yes" : "no"); */ if ((packet->header.type == SWITCH_STUN_BINDING_REQUEST) && !strcmp(rtp_session->user_ice, username)) { uint8_t buf[512]; switch_stun_packet_t *rpacket; @@ -239,7 +239,7 @@ memset(buf, 0, sizeof(buf)); rpacket = switch_stun_packet_build_header(SWITCH_STUN_BINDING_RESPONSE, packet->header.id, buf); switch_stun_packet_attribute_add_username(rpacket, username, 32); - //switch_sockaddr_ip_get(&remote_ip, rtp_session->from_addr); + /* switch_sockaddr_ip_get(&remote_ip, rtp_session->from_addr); */ remote_ip = switch_get_addr(ipbuf, sizeof(ipbuf), rtp_session->from_addr); @@ -427,8 +427,9 @@ return SWITCH_STATUS_FALSE; } - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set master key/salt to %s/", octet_string_hex_string(key, 16)); - //switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s\n", octet_string_hex_string(key+16, 14)); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set master key/salt to %s/", octet_string_hex_string(key, 16)); + * switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s\n", octet_string_hex_string(key+16, 14)); + */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } @@ -678,7 +679,7 @@ duration = rtp_session->dtmf_data.out_digit_sofar; } - //ts = rtp_session->dtmf_data.timestamp_dtmf += samples; + /* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; */ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; @@ -719,8 +720,9 @@ rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char)switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; - //ts = rtp_session->dtmf_data.timestamp_dtmf += samples; - //rtp_session->dtmf_data.timestamp_dtmf++; + /* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; + * rtp_session->dtmf_data.timestamp_dtmf++; + */ rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq; @@ -1131,7 +1133,7 @@ if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) { rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0; rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq; - //printf("RESCAN\n"); + /* printf("RESCAN\n"); */ } if (switch_core_codec_decode(&rtp_session->vad_data.vad_codec, @@ -1162,8 +1164,9 @@ rtp_session->vad_data.bg_level += score; if (++rtp_session->vad_data.bg_count == rtp_session->vad_data.bg_len) { rtp_session->vad_data.bg_level /= rtp_session->vad_data.bg_len; - //rtp_session->vad_data.bg_level += (rtp_session->vad_data.bg_level / 3); - //printf("AVG %u\n", rtp_session->vad_data.bg_level); + /* rtp_session->vad_data.bg_level += (rtp_session->vad_data.bg_level / 3); + * printf("AVG %u\n", rtp_session->vad_data.bg_level); + */ } send = 1; } else { @@ -1215,8 +1218,9 @@ if (switch_test_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_CNG) && ++rtp_session->vad_data.cng_count >= rtp_session->vad_data.cng_freq) { rtp_session->send_msg.header.pt = SWITCH_RTP_CNG_PAYLOAD; memset(rtp_session->send_msg.body, 255, SWITCH_RTP_CNG_PAYLOAD); - //rtp_session->send_msg.header.ts = htonl(rtp_session->vad_data.ts); - //rtp_session->vad_data.ts++; + /* rtp_session->send_msg.header.ts = htonl(rtp_session->vad_data.ts); + * rtp_session->vad_data.ts++; + */ bytes = SWITCH_RTP_CNG_PAYLOAD; send = 1; rtp_session->vad_data.cng_count = 0;

1 0

[commit] r4443 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '07

04 Mar '07

Author: brian Date: Sat Mar 3 20:50:52 2007 New Revision: 4443 Modified: freeswitch/trunk/src/switch_event.c Log: fix more comments Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Mar 3 20:50:52 2007 @@ -41,8 +41,8 @@ static switch_mutex_t *EVENT_QUEUE_HAVEMORE_MUTEX = NULL; static switch_thread_cond_t *EVENT_QUEUE_CONDITIONAL = NULL; static switch_memory_pool_t *RUNTIME_POOL = NULL; -//static switch_memory_pool_t *APOOL = NULL; -//static switch_memory_pool_t *BPOOL = NULL; +/* static switch_memory_pool_t *APOOL = NULL; */ +/* static switch_memory_pool_t *BPOOL = NULL; */ static switch_memory_pool_t *THRUNTIME_POOL = NULL; static switch_queue_t *EVENT_QUEUE[3] = {0,0,0}; static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN; @@ -209,34 +209,36 @@ if (!any) { - //lock on havemore so we are the only ones poking at it while we check it - //see if we saw anything in the queues or have a check again flag + /* lock on havemore so we are the only ones poking at it while we check it + * see if we saw anything in the queues or have a check again flag + */ switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); if(!EVENT_QUEUE_HAVEMORE) { - //See if we need to quit + /* See if we need to quit */ if (THREAD_RUNNING != 1) { - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //Game over + /* game over */ break; } - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //wait until someone tells us we have something to do + /* wait until someone tells us we have something to do */ switch_thread_cond_wait(EVENT_QUEUE_CONDITIONAL, EVENT_QUEUE_MUTEX); } else { - //Caught a race, one of the queues was updated after we looked at it - //reset our flag + /* Caught a race, one of the queues was updated after we looked at it + * reset our flag + */ EVENT_QUEUE_HAVEMORE = 0; - //Give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); } - //go grab some events + /* go grab some events */ continue; } @@ -348,24 +350,27 @@ if (THREAD_RUNNING > 0) { THREAD_RUNNING = -1; - //Lock on havemore to make sure he event thread, if currently running - // doesn't check the HAVEMORE flag before we set it + /* lock on havemore to make sure he event thread, if currently running + * doesn't check the HAVEMORE flag before we set it + */ switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); - //See if the event thread is sitting + /* see if the event thread is sitting */ if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { - //we don't need havemore anymore, the thread was sitting already + /* we don't need havemore anymore, the thread was sitting already */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //wake up the event thread + /* wake up the event thread */ switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_MUTEX); - } else { // it wasn't waiting which means we might have updated a queue it already looked at - //set a flag so it knows to read the queues again + } else { + /* it wasn't waiting which means we might have updated a queue it already looked at + * set a flag so it knows to read the queues again + */ EVENT_QUEUE_HAVEMORE = 1; - //variable updated, give up the mutex + /* variable updated, give up the mutex */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); } @@ -401,7 +406,7 @@ return SWITCH_STATUS_MEMERR; } */ - //THRUNTIME_POOL = APOOL; + /* THRUNTIME_POOL = APOOL; */ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); @@ -627,7 +632,7 @@ return SWITCH_STATUS_MEMERR; } - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); */ for (hp = event->headers; hp; hp = hp->next) { /* * grab enough memory to store 3x the string (url encode takes one char and turns it into %XX) @@ -641,7 +646,7 @@ if(encode_len < new_len) { char* tmp; - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); */ /* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */ /* keep track of the size of our allocation */ @@ -834,24 +839,27 @@ switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); - //Lock on havemore to make sure he event thread, if currently running - // doesn't check the HAVEMORE flag before we set it + /* lock on havemore to make sure he event thread, if currently running + * doesn't check the HAVEMORE flag before we set it + */ switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); - //See if the event thread is sitting + /* see if the event thread is sitting */ if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { - //we don't need havemore anymore, the thread was sitting already + /* we don't need havemore anymore, the thread was sitting already */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); - //wake up the event thread + /* wake up the event thread */ switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); - //give up our lock + /* give up our lock */ switch_mutex_unlock(EVENT_QUEUE_MUTEX); - } else { // it wasn't waiting which means we might have updated a queue it already looked at - //set a flag so it knows to read the queues again + } else { + /* it wasn't waiting which means we might have updated a queue it already looked at + * set a flag so it knows to read the queues again + */ EVENT_QUEUE_HAVEMORE = 1; - //variable updated, give up the mutex + /* variable updated, give up the mutex */ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); }

1 0