- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6046 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Oct '07

24 Oct '07

Author: anthm Date: Tue Oct 23 21:45:08 2007 New Revision: 6046 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: worth a shot sheesh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Oct 23 21:45:08 2007 @@ -508,16 +508,12 @@ char *to; char *open; char *tmp; - char *prpid = rpid; + char *prpid = "onthephone"; if (!rpid) { rpid = "unknown"; } - if (!prpid) { - prpid = "onthephone"; - } - if (in) { note = switch_mprintf("<dm:note>%s</dm:note>", status); open = "open";

1 0

[commit] r6045 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Oct '07

24 Oct '07

Author: anthm Date: Tue Oct 23 21:39:52 2007 New Revision: 6045 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: worth a shot Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Oct 23 21:39:52 2007 @@ -508,11 +508,16 @@ char *to; char *open; char *tmp; + char *prpid = rpid; if (!rpid) { rpid = "unknown"; } + if (!prpid) { + prpid = "onthephone"; + } + if (in) { note = switch_mprintf("<dm:note>%s</dm:note>", status); open = "open"; @@ -554,7 +559,7 @@ "</tuple>\r\n" "<dm:person id='p06360c4a'>\r\n" "<rpid:activities>\r\n" "<rpid:%s/>\r\n" "</rpid:activities>%s</dm:person>\r\n" "</presence>", id, - id, profile->url, note, rpid, + id, profile->url, status, prpid, open, rpid, note);

1 0

[commit] r6044 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Oct '07

24 Oct '07

Author: anthm Date: Tue Oct 23 21:32:30 2007 New Revision: 6044 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: worth a shot Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Oct 23 21:32:30 2007 @@ -532,8 +532,6 @@ } to = switch_mprintf("sip:%s@%s", user, host); - tmp = contact; - contact = sofia_glue_get_url_from_contact(tmp, 0); pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n" "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model'\r\n" @@ -543,7 +541,9 @@ "<presentity uri=\"%s;method=SUBSCRIBE\"/>\r\n" "<atom id=\"1002\">\r\n" "<address uri=\"%s\" priority=\"0.800000\">\r\n" - "<status status=\"inuse\"/>\r\n" + "<status status=\"inuse\">\r\n" + "<note>%s</note>\r\n" + "</status>\r\n" "<msnsubstatus substatus=\"%s\"/>\r\n" "</address>\r\n" "</atom>\r\n" @@ -554,10 +554,12 @@ "</tuple>\r\n" "<dm:person id='p06360c4a'>\r\n" "<rpid:activities>\r\n" "<rpid:%s/>\r\n" "</rpid:activities>%s</dm:person>\r\n" "</presence>", id, - id, contact, rpid, + id, profile->url, note, rpid, open, rpid, note); + tmp = contact; + contact = sofia_glue_get_url_from_contact(tmp, 0); nh = nua_handle(profile->nua, NULL, TAG_END());

1 0

[commit] r6043 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Oct '07

24 Oct '07

Author: anthm Date: Tue Oct 23 21:27:58 2007 New Revision: 6043 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: worth a shot Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Oct 23 21:27:58 2007 @@ -532,6 +532,8 @@ } to = switch_mprintf("sip:%s@%s", user, host); + tmp = contact; + contact = sofia_glue_get_url_from_contact(tmp, 0); pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n" "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model'\r\n" @@ -558,8 +560,7 @@ nh = nua_handle(profile->nua, NULL, TAG_END()); - tmp = contact; - contact = sofia_glue_get_url_from_contact(tmp, 0); + nua_notify(nh, NUTAG_NEWSUB(1),

1 0

[commit] r6042 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Oct '07

24 Oct '07

Author: anthm Date: Tue Oct 23 21:20:04 2007 New Revision: 6042 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: worth a shot Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Oct 23 21:20:04 2007 @@ -538,13 +538,22 @@ "xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid'\r\n" "xmlns:c='urn:ietf:params:xml:ns:pidf:cipid'\r\n" "entity='pres:%s'>\r\n" + "<presentity uri=\"%s;method=SUBSCRIBE\"/>\r\n" + "<atom id=\"1002\">\r\n" + "<address uri=\"%s\" priority=\"0.800000\">\r\n" + "<status status=\"inuse\"/>\r\n" + "<msnsubstatus substatus=\"%s\"/>\r\n" + "</address>\r\n" + "</atom>\r\n" "<tuple id='t6a5ed77e'>\r\n" "<status>\r\n" "<basic>%s</basic>\r\n" "</status>\r\n" "</tuple>\r\n" "<dm:person id='p06360c4a'>\r\n" - "<rpid:activities>\r\n" "<rpid:%s/>\r\n" "</rpid:activities>%s</dm:person>\r\n" "</presence>", id, open, rpid, note); + "<rpid:activities>\r\n" "<rpid:%s/>\r\n" "</rpid:activities>%s</dm:person>\r\n" "</presence>", id, + id, contact, rpid, + open, rpid, note);

1 0

[commit] r6041 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Oct '07

24 Oct '07

Author: anthm Date: Tue Oct 23 20:06:33 2007 New Revision: 6041 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: sip is stupid Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Oct 23 20:06:33 2007 @@ -922,6 +922,7 @@ switch_channel_mark_pre_answered(channel); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Oct 23 20:06:33 2007 @@ -1916,6 +1916,8 @@ uint32_t sess_count = switch_core_session_count(); uint32_t sess_max = switch_core_session_limit(0); int is_auth = 0; + su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); + if ((profile->soft_max && sess_count >= profile->soft_max) || sess_count >= sess_max) { nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); @@ -1962,7 +1964,8 @@ 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); + + get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); channel = switch_core_session_get_channel(session); if (is_auth) { @@ -2029,16 +2032,30 @@ if (sip->sip_to && sip->sip_to->a_url) { char *val; + char *transport = (my_addrinfo->ai_socktype == SOCK_STREAM) ? "tcp" : "udp"; + url_set_chanvars(session, sip->sip_to->a_url, sip_to); if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { - tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s", val); + tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s;transport=%s", val, transport); if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { - tech_pvt->reply_contact = tech_pvt->to_uri; + if (strchr(tech_pvt->to_uri, '>')) { + tech_pvt->reply_contact = tech_pvt->to_uri; + } else { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s>", tech_pvt->to_uri); + } } else { - tech_pvt->reply_contact = switch_core_session_strdup(session, profile->url); + if (strchr(profile->url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, transport); + } else { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, transport); + } } } else { - tech_pvt->reply_contact = switch_core_session_strdup(session, profile->url); + if (strchr(profile->url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, transport); + } else { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, transport); + } } }

1 0

[commit] r6040 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 18:24:11 2007 New Revision: 6040 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: calls to portaudio/auto_answer will do auto_answer Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Oct 23 18:24:11 2007 @@ -775,6 +775,10 @@ caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); switch_channel_set_caller_profile(channel, caller_profile); tech_pvt->caller_profile = caller_profile; + if (outbound_profile->destination_number && !strcasecmp(outbound_profile->destination_number, "auto_answer")) { + switch_set_flag(tech_pvt, TFLAG_ANSWER); + } + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); switch_core_session_destroy(new_session);

1 0

[commit] r6039 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 18:15:09 2007 New Revision: 6039 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: add newsub tag to presence notify Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Oct 23 18:15:09 2007 @@ -553,6 +553,7 @@ contact = sofia_glue_get_url_from_contact(tmp, 0); nua_notify(nh, + NUTAG_NEWSUB(1), NUTAG_URL(contact), SIPTAG_TO_STR(full_from), SIPTAG_FROM_STR(id),

1 0

[commit] r6038 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 17:56:31 2007 New Revision: 6038 Modified: freeswitch/trunk/src/switch_event.c Log: fix stupidness Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Oct 23 17:56:31 2007 @@ -545,7 +545,7 @@ switch_event_header_t *hp, *lp = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - for (hp = event->headers; hp && hp->next; hp = hp->next) { + for (hp = event->headers; hp; hp = hp->next) { if (!strcmp(header_name, hp->name)) { if (lp) { lp->next = hp->next;

1 0

[commit] r6037 - in freeswitch/trunk/src: . include
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Tue Oct 23 17:32:17 2007 New Revision: 6037 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_rtp.c Log: fix MODAPP-3 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 23 17:32:17 2007 @@ -632,6 +632,7 @@ SFF_RAW_RTP = (1 << 1) - Frame has raw rtp accessible SFF_RTP_HEADER = (1 << 2) - Get the rtp header from the frame header SFF_PLC = (1 << 3) - Frame has generated PLC data +SFF_RFC2833 = (1 << 4) - Frame has rfc2833 dtmf data </pre> */ typedef enum { @@ -639,7 +640,8 @@ SFF_CNG = (1 << 0), SFF_RAW_RTP = (1 << 1), SFF_RTP_HEADER = (1 << 2), - SFF_PLC = (1 << 3) + SFF_PLC = (1 << 3), + SFF_RFC2833 = (1 << 4) } switch_frame_flag_t; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 23 17:32:17 2007 @@ -1219,6 +1219,9 @@ frame->packetlen = bytes; frame->source = __FILE__; frame->flags |= SFF_RAW_RTP; + if (frame->payload == rtp_session->te) { + frame->flags |= SFF_RFC2833; + } frame->timestamp = ntohl(rtp_session->recv_msg.header.ts); frame->seq = (uint16_t)ntohs((u_short)rtp_session->recv_msg.header.seq); frame->ssrc = ntohl(rtp_session->recv_msg.header.ssrc); @@ -1282,8 +1285,15 @@ if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data; + if (*flags & SFF_RFC2833) { + send_msg->header.pt = rtp_session->te; + } } else { uint8_t m = 0; + + if (*flags & SFF_RFC2833) { + payload = rtp_session->te; + } if ((rtp_session->ts > (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 10))) || rtp_session->ts == rtp_session->samples_per_interval) {

1 0