December 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10821 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 15:16:58 2008 New Revision: 10821 Log: Fri Nov 14 17:26:48 CST 2008 Jarod Neuner <janeuner(a)networkharbor.com> * sips_in_contact_bug Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 15:16:58 2008 @@ -1 +1 @@ -Tue Dec 16 14:12:18 CST 2008 +Tue Dec 16 14:15:24 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Tue Dec 16 15:16:58 2008 @@ -2011,6 +2011,7 @@ if (sip_transport_has_tls(v->v_protocol) || sip_transport_has_tls(transport)) { url.url_type = url_sips; + url.url_scheme = url_scheme(url_sips); if (port && strcmp(port, SIPS_DEFAULT_SERV) == 0) port = NULL; if (port || host_is_ip_address(host))

1 0

[commit] r10820 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 15:12:43 2008 New Revision: 10820 Log: Wed Nov 12 12:33:20 CST 2008 Pekka Pessi <first.last(a)nokia.com> * nta: moved truly internal data type definitions into nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 15:12:43 2008 @@ -1 +1 @@ -Tue Dec 16 14:10:06 CST 2008 +Tue Dec 16 14:12:18 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Dec 16 15:12:43 2008 @@ -67,13 +67,20 @@ #include <sofia-sip/sip_status.h> #include <sofia-sip/hostdomain.h> +#include <sofia-sip/url_tag.h> #include <sofia-sip/msg_addr.h> #include <sofia-sip/msg_parser.h> +/* Resolver context type */ +#define SRES_CONTEXT_T nta_outgoing_t + +/* We are customer of tport_t */ +#define TP_AGENT_T nta_agent_t +#define TP_MAGIC_T sip_via_t +#define TP_CLIENT_T nta_outgoing_t + #include "nta_internal.h" -#include "sofia-sip/nta_stateless.h" -#include "sofia-sip/url_tag.h" #include <stddef.h> #include <stdlib.h> @@ -95,6 +102,461 @@ #define NONE ((void *)-1) +/* ------------------------------------------------------------------------- */ + +/** Resolving order */ +enum nta_res_order_e +{ + nta_res_ip6_ip4, + nta_res_ip4_ip6, + nta_res_ip6_only, + nta_res_ip4_only +}; + +HTABLE_DECLARE_WITH(leg_htable, lht, nta_leg_t, size_t, hash_value_t); +HTABLE_DECLARE_WITH(outgoing_htable, oht, nta_outgoing_t, size_t, hash_value_t); +HTABLE_DECLARE_WITH(incoming_htable, iht, nta_incoming_t, size_t, hash_value_t); + +typedef struct outgoing_queue_t { + nta_outgoing_t **q_tail; + nta_outgoing_t *q_head; + size_t q_length; + unsigned q_timeout; +} outgoing_queue_t; + +typedef struct incoming_queue_t { + nta_incoming_t **q_tail; + nta_incoming_t *q_head; + size_t q_length; + unsigned q_timeout; +} incoming_queue_t; + +struct nta_agent_s +{ + su_home_t sa_home[1]; + su_root_t *sa_root; + su_timer_t *sa_timer; + nta_agent_magic_t *sa_magic; + nta_message_f *sa_callback; + + nta_update_magic_t *sa_update_magic; + nta_update_tport_f *sa_update_tport; + + su_time_t sa_now; /**< Timestamp in microsecond resolution. */ + uint32_t sa_next; /**< Timestamp for next agent_timer. */ + uint32_t sa_millisec; /**< Timestamp in milliseconds. */ + + msg_mclass_t const *sa_mclass; + uint32_t sa_flags; /**< SIP message flags */ + unsigned sa_preload; /**< Memory preload for SIP messages. */ + + tport_t *sa_tports; + sip_contact_t *sa_contact; + sip_via_t *sa_vias; /**< @Via headers for all transports */ + sip_via_t *sa_public_vias; /**< @Vias for public transports */ + sip_contact_t *sa_aliases;/**< List of aliases for agent */ + + uint64_t sa_branch; /**< Generator for branch parameters */ + uint64_t sa_tags; /**< Generator for tag parameters */ + +#if HAVE_SOFIA_SRESOLV + sres_resolver_t *sa_resolver; /**< DNS resolver */ + enum nta_res_order_e sa_res_order; /** Resolving order (AAAA/A) */ +#endif + + url_t *sa_default_proxy; /**< Default outbound proxy */ + unsigned sa_bad_req_mask; /**< Request error mask */ + unsigned sa_bad_resp_mask; /**< Response error mask */ + size_t sa_maxsize; /**< Maximum size of incoming messages */ + size_t sa_max_proceeding; /**< Maximum size of proceeding queue */ + + unsigned sa_udp_mtu; /**< Maximum size of outgoing UDP requests */ + + unsigned sa_t1; /**< SIP T1 - initial retransmit interval (500 ms) */ + unsigned sa_t2; /**< SIP T2 - maximum retransmit interval (4000 ms) */ + unsigned sa_t4; /**< SIP T4 - clear message time (5000 ms) */ + + + unsigned sa_t1x64; /**< SIP T1X64 - transaction lifetime (32 s) */ + + unsigned sa_progress; /**< Progress timer. + Interval between retransmitting + provisional responses. */ + + unsigned sa_timer_c; /**< SIP timer C. + Maximum interval between receiving + provisional responses. */ + + unsigned sa_graylist; /**< Graylisting period */ + unsigned sa_blacklist; /**< Blacklisting period */ + + unsigned sa_drop_prob : 10; /**< NTA is used to test packet drop */ + unsigned sa_is_a_uas : 1; /**< NTA is acting as an User Agent server */ + unsigned sa_is_stateless : 1; /**< Process requests statelessly + * unless they match existing dialog. + */ + unsigned sa_user_via:1; /**< Let application provide @Via headers */ + unsigned sa_extra_100:1; /**< Allow NTA to return "100 Trying" response + * even if application has not responded. + */ + unsigned sa_pass_100:1; /**< Pass the "100 Trying" + * provisional responses to the application + */ + unsigned sa_timeout_408:1; /**< A "408 Request Timeout" message + * is generated when outgoing request expires. + */ + unsigned sa_pass_408:1; /**< A "408 Request Timeout" responses + * are passed to client. + */ + unsigned sa_merge_482 : 1; /**< A "482 Request Merged" response is returned + * to merged requests. + */ + unsigned sa_cancel_2543 : 1; /**< Send a CANCEL to an INVITE without + * waiting for an provisional response. + */ + unsigned sa_cancel_487 : 1; /**< Return 487 response automatically when + * a CANCEL is received. + */ + + unsigned sa_invite_100rel:1; /**< Include 100rel in INVITE requests. */ + unsigned sa_timestamp : 1; /**< Insert @Timestamp in requests. */ + + unsigned sa_tport_ip4 : 1; /**< Transports support IPv4. */ + unsigned sa_tport_ip6 : 1; /**< Transports support IPv6. */ + unsigned sa_tport_udp : 1; /**< Transports support UDP. */ + unsigned sa_tport_tcp : 1; /**< Transports support TCP. */ + unsigned sa_tport_sctp : 1; /**< Transports support SCTP. */ + unsigned sa_tport_tls : 1; /**< Transports support TLS. */ + + unsigned sa_use_naptr : 1; /**< Use NAPTR lookup */ + unsigned sa_use_srv : 1; /**< Use SRV lookup */ + + unsigned sa_tport_threadpool:1; /**< Transports use threadpool */ + + unsigned sa_rport:1; /**< Use rport at client */ + unsigned sa_server_rport:2; /**< Use rport at server */ + unsigned sa_tcp_rport:1; /**< Use rport with tcp, too */ + unsigned sa_tls_rport:1; /**< Use rport with tls, too */ + + unsigned sa_auto_comp:1; /**< Automatically create compartments */ + unsigned sa_in_timer:1; /**< Set when executing timers */ + unsigned sa_use_timer_c:1; /**< Application has set value for timer C */ + + unsigned :0; + +#if HAVE_SMIME + sm_object_t *sa_smime; +#else + void *sa_smime; +#endif + + /** @MaxForwards */ + sip_max_forwards_t sa_max_forwards[1]; + + /** Name of SigComp algorithm */ + char const *sa_algorithm; + /** Options for SigComp. */ + char const *sa_sigcomp_options; + char const* const *sa_sigcomp_option_list; + char const *sa_sigcomp_option_free; + + nta_compressor_t *sa_compressor; + + /* Statistics */ + struct { + usize_t as_recv_msg; + usize_t as_recv_request; + usize_t as_recv_response; + usize_t as_bad_message; + usize_t as_bad_request; + usize_t as_bad_response; + usize_t as_drop_request; + usize_t as_drop_response; + usize_t as_client_tr; + usize_t as_server_tr; + usize_t as_dialog_tr; + usize_t as_acked_tr; + usize_t as_canceled_tr; + usize_t as_trless_request; + usize_t as_trless_to_tr; + usize_t as_trless_response; + usize_t as_trless_200; + usize_t as_merged_request; + usize_t as_sent_msg; + usize_t as_sent_request; + usize_t as_sent_response; + usize_t as_retry_request; + usize_t as_retry_response; + usize_t as_recv_retry; + usize_t as_tout_request; + usize_t as_tout_response; + } sa_stats[1]; + + /** Hash of dialogs. */ + leg_htable_t sa_dialogs[1]; + /** Default leg */ + nta_leg_t *sa_default_leg; + /** Hash of legs without dialogs. */ + leg_htable_t sa_defaults[1]; + /** Hash table for outgoing transactions */ + outgoing_htable_t sa_outgoing[1]; + nta_outgoing_t *sa_default_outgoing; + /** Hash table for incoming transactions */ + incoming_htable_t sa_incoming[1]; + nta_incoming_t *sa_default_incoming; + + /* Queues (states) for outgoing client transactions */ + struct { + /** Queue for retrying client transactions */ + nta_outgoing_t *re_list; + nta_outgoing_t **re_t1; /**< Special place for T1 timer */ + size_t re_length; /**< Length of sa_out.re_list */ + + outgoing_queue_t delayed[1]; + outgoing_queue_t resolving[1]; + + outgoing_queue_t trying[1]; /* Timer F/E */ + outgoing_queue_t completed[1]; /* Timer K */ + outgoing_queue_t terminated[1]; + + /* Special queues (states) for outgoing INVITE transactions */ + outgoing_queue_t inv_calling[1]; /* Timer B/A */ + outgoing_queue_t inv_proceeding[1]; /* Timer C */ + outgoing_queue_t inv_completed[1]; /* Timer D */ + + /* Temporary queue for transactions waiting to be freed */ + outgoing_queue_t *free; + } sa_out; + + /* Queues (states) for incoming server transactions */ + struct { + /** Queue for retransmitting response of server transactions */ + nta_incoming_t *re_list; + nta_incoming_t **re_t1; /**< Special place for T1 timer */ + size_t re_length; /**< Length of sa_in.re_list */ + + incoming_queue_t proceeding[1]; /**< Request received */ + incoming_queue_t preliminary[1]; /**< 100rel sent */ + incoming_queue_t completed[1]; /**< Final answer sent (non-invite). */ + incoming_queue_t inv_completed[1]; /**< Final answer sent (INVITE). */ + incoming_queue_t inv_confirmed[1]; /**< Final answer sent, ACK recvd. */ + incoming_queue_t terminated[1]; /**< Terminated, ready to free. */ + incoming_queue_t final_failed[1]; + } sa_in; + + /* Special task for freeing memory */ + su_clone_r sa_terminator; +}; + +struct nta_leg_s +{ + su_home_t leg_home[1]; + hash_value_t leg_hash; + + unsigned leg_dialog : 1; + unsigned leg_stateless : 1; /**< Process requests statelessly */ +#ifdef NTA_STRICT_ROUTING + unsigned leg_contact_set : 1; +#else + unsigned leg_loose_route : 1; /**< Topmost route in set is LR */ +#endif + unsigned leg_local_is_to : 1; /**< Backwards-compatibility. */ + unsigned leg_tagged : 1; /**< Tagged after creation. + * + * Request missing @To tag matches + * a tagged leg even after tagging. + */ + unsigned:0; + nta_request_f *leg_callback; + nta_leg_magic_t *leg_magic; + nta_agent_t *leg_agent; + + url_t const *leg_url; /**< Match incoming requests. */ + char const *leg_method; /**< Match incoming requests. */ + + uint32_t leg_seq; /**< Sequence number for next transaction */ + uint32_t leg_rseq; /**< Remote sequence number */ + sip_call_id_t *leg_id; /**< Call ID */ + sip_from_t *leg_remote; /**< Remote address (@To/@From) */ + sip_to_t *leg_local; /**< Local address (@From/@To) */ + + sip_route_t *leg_route; /**< @Route for outgoing requests. */ + sip_contact_t *leg_target; /**< Remote destination (from @Contact). */ +}; + +struct nta_incoming_s +{ + su_home_t *irq_home; + hash_value_t irq_hash; + nta_agent_t *irq_agent; + nta_ack_cancel_f *irq_callback; + nta_incoming_magic_t *irq_magic; + + /* Timeout/state queue */ + nta_incoming_t **irq_prev; + nta_incoming_t *irq_next; + incoming_queue_t *irq_queue; + + /* Retry queue */ + nta_incoming_t **irq_rprev; + nta_incoming_t *irq_rnext; + + sip_method_t irq_method; + sip_request_t *irq_rq; + sip_from_t *irq_from; + sip_to_t *irq_to; + char const *irq_tag; + sip_cseq_t *irq_cseq; + sip_call_id_t *irq_call_id; + sip_via_t *irq_via; + sip_record_route_t *irq_record_route; + char const *irq_branch; + + uint32_t irq_rseq; + + sip_timestamp_t *irq_timestamp; + su_time_t irq_received; + + uint32_t irq_timeout; /**< Timer H, I, J */ + uint32_t irq_retry; /**< Timer G */ + unsigned short irq_interval; /**< Next timer */ + + short irq_status; + + unsigned irq_retries:8; + unsigned irq_default:1; /**< Default transaction */ + unsigned irq_canceled:1; /**< Transaction is canceled */ + unsigned irq_completed:1; /**< Transaction is completed */ + unsigned irq_confirmed:1; /**< Response has been acked */ + unsigned irq_terminated:1; /**< Transaction is terminated */ + unsigned irq_final_failed:1; /**< Sending final response failed */ + unsigned irq_destroyed :1; /**< Transaction is destroyed */ + unsigned irq_in_callback:1; /**< Callback is being invoked */ + unsigned irq_reliable_tp:1; /**< Transport is reliable */ + unsigned irq_sigcomp_zap:1; /**< Reset SigComp */ + unsigned irq_must_100rel:1; /**< 100rel is required */ + unsigned irq_tag_set:1; /**< Tag is not from request */ + unsigned :0; + + tp_name_t irq_tpn[1]; + tport_t *irq_tport; + struct sigcomp_compartment *irq_cc; + msg_t *irq_request; + msg_t *irq_request2; /**< ACK/CANCEL */ + msg_t *irq_response; + + nta_reliable_t *irq_reliable; /**< List of reliable responses */ +}; + +struct nta_reliable_s +{ + nta_reliable_t *rel_next; + nta_incoming_t *rel_irq; + nta_prack_f *rel_callback; + nta_reliable_magic_t *rel_magic; + uint32_t rel_rseq; + unsigned short rel_status; + unsigned rel_pracked:1; + unsigned rel_precious:1; + msg_t *rel_response; + msg_t *rel_unsent; +}; + +typedef struct sipdns_resolver sipdns_resolver_t; + +struct nta_outgoing_s +{ + hash_value_t orq_hash; /**< Hash value */ + nta_agent_t *orq_agent; + nta_response_f *orq_callback; + nta_outgoing_magic_t *orq_magic; + + /* Timeout/state queue */ + nta_outgoing_t **orq_prev; + nta_outgoing_t *orq_next; + outgoing_queue_t *orq_queue; + + /* Retry queue */ + nta_outgoing_t **orq_rprev; + nta_outgoing_t *orq_rnext; + + sip_method_t orq_method; + char const *orq_method_name; + url_t const *orq_url; /**< Original RequestURI */ + + sip_from_t const *orq_from; + sip_to_t const *orq_to; + char const *orq_tag; /**< Tag from final response. */ + + sip_cseq_t const *orq_cseq; + sip_call_id_t const *orq_call_id; + + msg_t *orq_request; + msg_t *orq_response; + + su_time_t orq_sent; /**< When request was sent? */ + unsigned orq_delay; /**< RTT estimate */ + + uint32_t orq_retry; /**< Timer A, E */ + uint32_t orq_timeout; /**< Timer B, D, F, K */ + + unsigned short orq_interval; /**< Next timer A/E */ + + unsigned short orq_status; + unsigned char orq_retries; /**< Number of tries this far */ + unsigned orq_default:1; /**< This is default transaction */ + unsigned orq_inserted:1; + unsigned orq_resolved:1; + unsigned orq_prepared:1; /**< outgoing_prepare() called */ + unsigned orq_canceled:1; + unsigned orq_terminated:1; + unsigned orq_destroyed:1; + unsigned orq_completed:1; + unsigned orq_delayed:1; + unsigned orq_stripped_uri:1; + unsigned orq_user_tport:1; /**< Application provided tport - don't retry */ + unsigned orq_try_tcp_instead:1; + unsigned orq_try_udp_instead:1; + unsigned orq_reliable:1; /**< Transport is reliable */ + unsigned orq_ack_error:1; /**< ACK is sent by NTA */ + + /* Attributes */ + unsigned orq_user_via:1; + unsigned orq_stateless:1; + unsigned orq_pass_100:1; + unsigned orq_sigcomp_new:1; /**< Create compartment if needed */ + unsigned orq_sigcomp_zap:1; /**< Reset SigComp after completing */ + unsigned orq_must_100rel:1; + unsigned orq_timestamp:1; /**< Insert @Timestamp header. */ + unsigned orq_100rel:1; /**< Support 100rel */ + unsigned:0; /* pad */ + +#if HAVE_SOFIA_SRESOLV + sipdns_resolver_t *orq_resolver; +#endif + enum nta_res_order_e orq_res_order; /**< AAAA/A first? */ + + url_t *orq_route; /**< Route URL */ + tp_name_t orq_tpn[1]; /**< Where to send request */ + char const *orq_scheme; /**< Transport URL type */ + + tport_t *orq_tport; + struct sigcomp_compartment *orq_cc; + tagi_t *orq_tags; /**< Tport tag items */ + int orq_pending; /**< Request is pending in tport */ + + char const *orq_branch; /**< Transaction branch */ + char const *orq_via_branch; /**< @Via branch */ + + int *orq_status2b; /**< Delayed response */ + + nta_outgoing_t *orq_cancel; /**< CANCEL transaction */ + + uint32_t orq_rseq; /**< Latest incoming rseq */ +}; + +/* ------------------------------------------------------------------------- */ + /* Internal tags */ /* Delay sending of request */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Tue Dec 16 15:12:43 2008 @@ -28,536 +28,29 @@ /**@internal @file nta_internal.h * - * @brief Internals of NTA objects. + * @brief NTA internal interfaces. * * @author Pekka Pessi <Pekka.Pessi(a)nokia.com> * * @date Created: Tue Jul 18 09:18:32 2000 ppessi */ -/* Resolver context type */ -#define SRES_CONTEXT_T nta_outgoing_t +SOFIA_BEGIN_DECLS -/* We are customer of tport_t */ -#define TP_AGENT_T nta_agent_t -#define TP_MAGIC_T sip_via_t -#define TP_CLIENT_T nta_outgoing_t +/** A sip_flag telling that this message is internally generated. */ +#define NTA_INTERNAL_MSG (1<<15) #include <sofia-sip/nta.h> #include <sofia-sip/nta_tport.h> +#include <sofia-sip/nta_stateless.h> #include <sofia-sip/tport.h> - #if HAVE_SOFIA_SRESOLV #include <sofia-sip/sresolv.h> #endif - #include <sofia-sip/htable.h> -#if HAVE_SMIME -#include "smimec.h" -#endif - -SOFIA_BEGIN_DECLS - -/** A sip_flag telling that this message is internally generated. */ -#define NTA_INTERNAL_MSG (1<<15) - -/** Resolving order */ -enum nta_res_order_e -{ - nta_res_ip6_ip4, - nta_res_ip4_ip6, - nta_res_ip6_only, - nta_res_ip4_only -}; - -HTABLE_DECLARE_WITH(leg_htable, lht, nta_leg_t, size_t, hash_value_t); -HTABLE_DECLARE_WITH(outgoing_htable, oht, nta_outgoing_t, size_t, hash_value_t); -HTABLE_DECLARE_WITH(incoming_htable, iht, nta_incoming_t, size_t, hash_value_t); - -typedef struct outgoing_queue_t { - nta_outgoing_t **q_tail; - nta_outgoing_t *q_head; - size_t q_length; - unsigned q_timeout; -} outgoing_queue_t; - -typedef struct incoming_queue_t { - nta_incoming_t **q_tail; - nta_incoming_t *q_head; - size_t q_length; - unsigned q_timeout; -} incoming_queue_t; - typedef struct nta_compressor nta_compressor_t; -struct nta_agent_s -{ - su_home_t sa_home[1]; - su_root_t *sa_root; - su_timer_t *sa_timer; - nta_agent_magic_t *sa_magic; - nta_message_f *sa_callback; - - nta_update_magic_t *sa_update_magic; - nta_update_tport_f *sa_update_tport; - - su_time_t sa_now; /**< Timestamp in microsecond resolution. */ - uint32_t sa_next; /**< Timestamp for next agent_timer. */ - uint32_t sa_millisec; /**< Timestamp in milliseconds. */ - - uint32_t sa_nw_updates; /* Shall we enable network detector? */ - - uint32_t sa_flags; /**< Message flags */ - msg_mclass_t const *sa_mclass; - - sip_contact_t *sa_contact; - sip_via_t *sa_vias; /**< @Via headers for all transports */ - sip_via_t *sa_public_vias; /**< @Vias for public transports */ - sip_contact_t *sa_aliases;/**< List of aliases for agent */ - - uint64_t sa_branch; /**< Counter for generating branch parameter */ - uint64_t sa_tags; /**< Counter for generating tag parameters */ - - char const *sa_2543_tag; /**< Fixed tag added to @To when responding */ - -#if HAVE_SOFIA_SRESOLV - sres_resolver_t *sa_resolver; /**< DNS resolver */ -#endif - - tport_t *sa_tports; - - /* Default outbound proxy */ - url_t *sa_default_proxy; - -#if HAVE_SMIME - sm_object_t *sa_smime; -#else - void *sa_smime; -#endif - - - /** Request error mask */ - unsigned sa_bad_req_mask; - /** Response error mask */ - unsigned sa_bad_resp_mask; - - /** Maximum size of incoming messages */ - size_t sa_maxsize; - - /** Maximum size of proceeding queue */ - size_t sa_max_proceeding; - - /** Maximum size of outgoing UDP requests */ - unsigned sa_udp_mtu; - - /** SIP T1 - initial interval of retransmissions (500 ms) */ - unsigned sa_t1; - /** SIP T2 - maximum interval of retransmissions (4000 ms) */ - unsigned sa_t2; - /** SIP T4 - clear message time (5000 ms) */ - unsigned sa_t4; - - /** SIP T1X64 - transaction lifetime (32 s) */ - unsigned sa_t1x64; - - /** Progress timer - interval between provisional responses sent */ - unsigned sa_progress; - - /** SIP timer C - interval between provisional responses receivedxs */ - unsigned sa_timer_c; - - /** Graylisting period */ - unsigned sa_graylist; - /** Blacklisting period */ - unsigned sa_blacklist; - - /** NTA is used to test packet drop */ - unsigned sa_drop_prob : 10; - /** NTA is acting as an User Agent server */ - unsigned sa_is_a_uas : 1; - /** Process requests outside dialog statelessly */ - unsigned sa_is_stateless : 1; - /** Let application provide @Via headers */ - unsigned sa_user_via:1; - /** Respond with "100 Trying" if application has not responded. */ - unsigned sa_extra_100:1; - /** The "100 Trying" provisional answers are passed to the application */ - unsigned sa_pass_100:1; - /** If true, a "408 Request Timeout" message is generated when outgoing - request expires. */ - unsigned sa_timeout_408:1; - /** If true, a "408 Request Timeout" responses are passed to client. */ - unsigned sa_pass_408:1; - /** If true, a "482 Request Merged" response is sent to merged requests. */ - unsigned sa_merge_482 : 1; - /** If true, send a CANCEL to an INVITE without an provisional response. */ - unsigned sa_cancel_2543 : 1; - /** If true, reply with 487 response when a CANCEL is received. */ - unsigned sa_cancel_487 : 1; - /** If true, use unique tags. */ - unsigned sa_tag_3261 : 1; - /** If true, include 100rel in INVITE requests. */ - unsigned sa_invite_100rel : 1; - /** If true, insert @Timestamp in requests. */ - unsigned sa_timestamp : 1; - - /** If true, transports support IPv4. */ - unsigned sa_tport_ip4 : 1; - /** If true, transports support IPv6. */ - unsigned sa_tport_ip6 : 1; - /** If true, transports support UDP. */ - unsigned sa_tport_udp : 1; - /** If true, transports support TCP. */ - unsigned sa_tport_tcp : 1; - /** If true, transports support SCTP. */ - unsigned sa_tport_sctp : 1; - /** If true, transports support TLS. */ - unsigned sa_tport_tls : 1; - - /** If true, use NAPTR lookup */ - unsigned sa_use_naptr : 1; - /** If true, use SRV lookup */ - unsigned sa_use_srv : 1; - - /** If true, transports use threadpool */ - unsigned sa_tport_threadpool : 1; - - /** If true, use rport at client */ - unsigned sa_rport:1; - /** If true, use rport at server */ - unsigned sa_server_rport:2; - /** If true, use rport with tcp, too */ - unsigned sa_tcp_rport:1; - /** If true, use rport with tls, too */ - unsigned sa_tls_rport:1; - - /** If true, automatically create compartments */ - unsigned sa_auto_comp:1; - - /** Set when executing timer */ - unsigned sa_in_timer:1; - - /** Set if application has set value for timer C */ - unsigned sa_use_timer_c:1; - - unsigned :0; - - /** Messages memory preload. */ - unsigned sa_preload; - - /** Name of SigComp algorithm */ - char const *sa_algorithm; - /** Options for SigComp. */ - char const *sa_sigcomp_options; - char const* const *sa_sigcomp_option_list; - char const *sa_sigcomp_option_free; - - nta_compressor_t *sa_compressor; - - /** Resolving order (AAAA/A) */ - enum nta_res_order_e sa_res_order; - - /** @MaxForwards */ - - sip_max_forwards_t sa_max_forwards[1]; - - /* Statistics */ - struct { - usize_t as_recv_msg; - usize_t as_recv_request; - usize_t as_recv_response; - usize_t as_bad_message; - usize_t as_bad_request; - usize_t as_bad_response; - usize_t as_drop_request; - usize_t as_drop_response; - usize_t as_client_tr; - usize_t as_server_tr; - usize_t as_dialog_tr; - usize_t as_acked_tr; - usize_t as_canceled_tr; - usize_t as_trless_request; - usize_t as_trless_to_tr; - usize_t as_trless_response; - usize_t as_trless_200; - usize_t as_merged_request; - usize_t as_sent_msg; - usize_t as_sent_request; - usize_t as_sent_response; - usize_t as_retry_request; - usize_t as_retry_response; - usize_t as_recv_retry; - usize_t as_tout_request; - usize_t as_tout_response; - } sa_stats[1]; - - /** Hash of dialogs. */ - leg_htable_t sa_dialogs[1]; - /** Default leg */ - nta_leg_t *sa_default_leg; - /** Hash of legs without dialogs. */ - leg_htable_t sa_defaults[1]; - /** Hash table for outgoing transactions */ - outgoing_htable_t sa_outgoing[1]; - nta_outgoing_t *sa_default_outgoing; - /** Hash table for incoming transactions */ - incoming_htable_t sa_incoming[1]; - nta_incoming_t *sa_default_incoming; - - /* Queues (states) for outgoing client transactions */ - struct { - /** Queue for retrying client transactions */ - nta_outgoing_t *re_list; - nta_outgoing_t **re_t1; /**< Special place for T1 timer */ - size_t re_length; /**< Length of sa_out.re_list */ - - outgoing_queue_t delayed[1]; - outgoing_queue_t resolving[1]; - - outgoing_queue_t trying[1]; /* Timer F/E */ - outgoing_queue_t completed[1]; /* Timer K */ - outgoing_queue_t terminated[1]; - - /* Special queues (states) for outgoing INVITE transactions */ - outgoing_queue_t inv_calling[1]; /* Timer B/A */ - outgoing_queue_t inv_proceeding[1]; /* Timer C */ - outgoing_queue_t inv_completed[1]; /* Timer D */ - - /* Temporary queue for transactions waiting to be freed */ - outgoing_queue_t *free; - } sa_out; - - /* Queues (states) for incoming server transactions */ - struct { - /** Queue for retransmitting response of server transactions */ - nta_incoming_t *re_list; - nta_incoming_t **re_t1; /**< Special place for T1 timer */ - size_t re_length; - - incoming_queue_t proceeding[1]; /**< Request received */ - incoming_queue_t preliminary[1]; /**< 100rel sent */ - incoming_queue_t completed[1]; /**< Final answer sent (non-invite). */ - incoming_queue_t inv_completed[1]; /**< Final answer sent (INVITE). */ - incoming_queue_t inv_confirmed[1]; /**< Final answer sent, ACK recvd. */ - incoming_queue_t terminated[1]; /**< Terminated, ready to free. */ - incoming_queue_t final_failed[1]; - } sa_in; - - /* Special task for freeing memory */ - su_clone_r sa_terminator; -}; - -struct nta_leg_s -{ - su_home_t leg_home[1]; - hash_value_t leg_hash; - unsigned leg_dialog : 1; - unsigned leg_stateless : 1; /**< Process requests statelessly */ -#ifdef NTA_STRICT_ROUTING - unsigned leg_contact_set : 1; -#else - unsigned leg_loose_route : 1; /**< Topmost route in set is LR */ -#endif - unsigned leg_local_is_to : 1; /**< Backwards-compatibility. */ - unsigned leg_tagged : 1; /**< Tagged after creation. - * - * Request missing To tag matches it - * even after tagging. - */ - unsigned:0; - nta_request_f *leg_callback; - nta_leg_magic_t *leg_magic; - nta_agent_t *leg_agent; - /** Leg URL. - * - * This is the URL used to match incoming requests. - */ - url_t const *leg_url; - char const *leg_method; /**< Method for this dialog. */ - - uint32_t leg_seq; /**< Sequence number for next transaction */ - uint32_t leg_rseq; /**< Remote sequence number */ - sip_call_id_t *leg_id; /**< Call ID */ - sip_from_t *leg_remote; /**< Remote address (@To/@From) */ - sip_to_t *leg_local; /**< Local address (@From/@To) */ - - sip_route_t *leg_route; /**< @Route for outgoing requests. */ - sip_contact_t *leg_target; /**< Remote destination (from @Contact). */ -}; - -#define leg_has_id(leg) ((leg)->leg_id != NULL) - -struct nta_incoming_s -{ - su_home_t *irq_home; - hash_value_t irq_hash; - nta_agent_t *irq_agent; - nta_ack_cancel_f *irq_callback; - nta_incoming_magic_t *irq_magic; - - /* Timeout/state queue */ - nta_incoming_t **irq_prev; - nta_incoming_t *irq_next; - incoming_queue_t *irq_queue; - - /* Retry queue */ - nta_incoming_t **irq_rprev; - nta_incoming_t *irq_rnext; - - sip_method_t irq_method; - sip_request_t *irq_rq; - sip_from_t *irq_from; - sip_to_t *irq_to; - char const *irq_tag; - sip_cseq_t *irq_cseq; - sip_call_id_t *irq_call_id; - sip_via_t *irq_via; - sip_record_route_t *irq_record_route; - char const *irq_branch; - - uint32_t irq_rseq; - - sip_timestamp_t *irq_timestamp; - su_time_t irq_received; - - uint32_t irq_timeout; /**< Timer H, I, J */ - uint32_t irq_retry; /**< Timer G */ - unsigned short irq_interval; /**< Next timer */ - - short irq_status; - - unsigned irq_retries : 8; - unsigned irq_default : 1; /**< Default transaction */ - unsigned irq_canceled : 1; /**< Transaction is canceled */ - unsigned irq_completed : 1; /**< Transaction is completed */ - unsigned irq_confirmed : 1; /**< Response has been acked */ - unsigned irq_terminated :1; /**< Transaction is terminated */ - unsigned irq_final_failed:1; /**< Sending final response failed */ - unsigned irq_destroyed :1; /**< Transaction is destroyed */ - unsigned irq_in_callback:1; /**< Callback is being invoked */ - unsigned irq_reliable_tp:1; /**< Transport is reliable */ - unsigned irq_sigcomp_zap:1; /**< Reset SigComp */ - unsigned irq_must_100rel:1; /**< 100rel is required */ - unsigned irq_tag_set:1; /**< Tag is not from request */ - unsigned :0; - - tp_name_t irq_tpn[1]; - tport_t *irq_tport; - struct sigcomp_compartment *irq_cc; - msg_t *irq_request; - msg_t *irq_request2; /**< ACK/CANCEL */ - msg_t *irq_response; - - nta_reliable_t *irq_reliable; /**< List of reliable responses */ -}; - -struct nta_reliable_s -{ - nta_reliable_t *rel_next; - nta_incoming_t *rel_irq; - nta_prack_f *rel_callback; - nta_reliable_magic_t *rel_magic; - uint32_t rel_rseq; - unsigned short rel_status; - unsigned rel_pracked : 1; - unsigned rel_precious : 1; - msg_t *rel_response; - msg_t *rel_unsent; -}; - -typedef struct sipdns_resolver sipdns_resolver_t; - -struct nta_outgoing_s -{ - hash_value_t orq_hash; /**< Hash value */ - nta_agent_t *orq_agent; - nta_response_f *orq_callback; - nta_outgoing_magic_t *orq_magic; - - /* Timeout/state queue */ - nta_outgoing_t **orq_prev; - nta_outgoing_t *orq_next; - outgoing_queue_t *orq_queue; - - /* Retry queue */ - nta_outgoing_t **orq_rprev; - nta_outgoing_t *orq_rnext; - - sip_method_t orq_method; - char const *orq_method_name; - url_t const *orq_url; /**< Original RequestURI */ - - sip_from_t const *orq_from; - sip_to_t const *orq_to; - char const *orq_tag; /**< Tag from final response. */ - - sip_cseq_t const *orq_cseq; - sip_call_id_t const *orq_call_id; - - msg_t *orq_request; - msg_t *orq_response; - - su_time_t orq_sent; /**< When request was sent? */ - unsigned orq_delay; /**< RTT estimate */ - - uint32_t orq_retry; /**< Timer A, E */ - uint32_t orq_timeout; /**< Timer B, D, F, K */ - - unsigned short orq_interval; /**< Next timer A/E */ - - unsigned short orq_status; - unsigned char orq_retries; /**< Number of tries this far */ - unsigned orq_default : 1; /**< This is default transaction */ - unsigned orq_inserted : 1; - unsigned orq_resolved : 1; - unsigned orq_prepared : 1; /**< outgoing_prepare() called */ - unsigned orq_canceled : 1; - unsigned orq_terminated : 1; - unsigned orq_destroyed : 1; - unsigned orq_completed : 1; - unsigned orq_delayed : 1; - unsigned orq_stripped_uri : 1; - unsigned orq_user_tport : 1; /**< Application provided tport - don't retry */ - unsigned orq_try_tcp_instead : 1; - unsigned orq_try_udp_instead : 1; - unsigned orq_reliable : 1; /**< Transport is reliable */ - unsigned orq_ack_error : 1; /**< ACK is sent by NTA */ - /* Attributes */ - unsigned orq_user_via : 1; - unsigned orq_stateless : 1; - unsigned orq_pass_100 : 1; - unsigned orq_sigcomp_new:1; /**< Create compartment if needed */ - unsigned orq_sigcomp_zap:1; /**< Reset SigComp after completing */ - unsigned orq_must_100rel : 1; - unsigned orq_timestamp : 1; /**< Insert @Timestamp header. */ - unsigned orq_100rel:1; /**< Support 100rel */ - unsigned : 0; /* pad */ - -#if HAVE_SOFIA_SRESOLV - sipdns_resolver_t *orq_resolver; -#endif - enum nta_res_order_e orq_res_order; /**< AAAA/A first? */ - - url_t *orq_route; /**< Route URL */ - tp_name_t orq_tpn[1]; /**< Where to send request */ - char const *orq_scheme; /**< Transport URL type */ - - tport_t *orq_tport; - struct sigcomp_compartment *orq_cc; - tagi_t *orq_tags; /**< Tport tag items */ - int orq_pending; /**< Request is pending in tport */ - - char const *orq_branch; /**< Transaction branch */ - char const *orq_via_branch; /**< @Via branch */ - - int *orq_status2b; /**< Delayed response */ - - nta_outgoing_t *orq_cancel; /**< CANCEL transaction */ - - uint32_t orq_rseq; /**< Latest incoming rseq */ -}; - /* Virtual function table for plugging in SigComp */ typedef struct { @@ -594,7 +87,7 @@ } nta_compressor_vtable_t; -extern nta_compressor_vtable_t *nta_compressor_vtable; +SOFIAPUBVAR nta_compressor_vtable_t *nta_compressor_vtable; SOFIAPUBFUN nta_compressor_t *nta_agent_init_sigcomp(nta_agent_t *sa); SOFIAPUBFUN void nta_agent_deinit_sigcomp(nta_agent_t *sa);

1 0

[commit] r10819 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: stkn Date: Tue Dec 16 15:12:36 2008 New Revision: 10819 Log: Do not redefined _FILE_OFFSET_BITS (fix for opensolaris) Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/file.c Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/file.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/file.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/file.c Tue Dec 16 15:12:36 2008 @@ -40,11 +40,15 @@ cause security exposures. */ +#if !defined(_FILE_OFFSET_BITS) #define _FILE_OFFSET_BITS 64 +#endif /* Tell GNU libc to make off_t 64 bits and all the POSIX file functions the versions that handle 64 bit file offsets. */ +#if !defined(_LARGE_FILES) #define _LARGE_FILES +#endif /* Same as above, but for AIX */ #include <string.h>

1 0

[commit] r10818 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta libsofia-sip-ua/nta/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 15:10:32 2008 New Revision: 10818 Log: Wed Nov 12 11:30:28 CST 2008 Fabio Ferrari <fabioferrari AT gmail DOT com> * nta: new tag NTATAG_TLS_RPORT() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 15:10:32 2008 @@ -1 +1 @@ -Tue Dec 16 13:59:44 CST 2008 +Tue Dec 16 14:10:06 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Dec 16 15:10:32 2008 @@ -361,6 +361,7 @@ * NTATAG_SIP_T1X64(), NTATAG_SIP_T1(), NTATAG_SIP_T2(), NTATAG_SIP_T4(), * NTATAG_STATELESS(), * NTATAG_TAG_3261(), NTATAG_TCP_RPORT(), NTATAG_TIMEOUT_408(), + * NTATAG_TLS_RPORT(), * NTATAG_TIMER_C(), NTATAG_MAX_PROCEEDING(), * NTATAG_UA(), NTATAG_UDP_MTU(), NTATAG_USER_VIA(), * NTATAG_USE_NAPTR(), NTATAG_USE_SRV() and NTATAG_USE_TIMESTAMP(). @@ -935,6 +936,7 @@ * NTATAG_SIP_T1X64(), NTATAG_SIP_T1(), NTATAG_SIP_T2(), NTATAG_SIP_T4(), * NTATAG_STATELESS(), * NTATAG_TAG_3261(), NTATAG_TCP_RPORT(), NTATAG_TIMEOUT_408(), + * NTATAG_TLS_RPORT(), * NTATAG_TIMER_C(), NTATAG_MAX_PROCEEDING(), * NTATAG_UA(), NTATAG_UDP_MTU(), NTATAG_USER_VIA(), * NTATAG_USE_NAPTR(), NTATAG_USE_SRV() and NTATAG_USE_TIMESTAMP(). @@ -999,6 +1001,7 @@ int rport = agent->sa_rport; int server_rport = agent->sa_server_rport; int tcp_rport = agent->sa_tcp_rport; + int tls_rport = agent->sa_tls_rport; unsigned preload = agent->sa_preload; unsigned threadpool = agent->sa_tport_threadpool; char const *sigcomp = agent->sa_sigcomp_options; @@ -1045,6 +1048,7 @@ #endif NTATAG_STATELESS_REF(stateless), NTATAG_TCP_RPORT_REF(tcp_rport), + NTATAG_TLS_RPORT_REF(tls_rport), NTATAG_TIMEOUT_408_REF(timeout_408), NTATAG_UA_REF(ua), NTATAG_UDP_MTU_REF(udp_mtu), @@ -1214,6 +1218,7 @@ agent->sa_flags = flags & MSG_FLG_USERMASK; agent->sa_rport = rport != 0; agent->sa_tcp_rport = tcp_rport != 0; + agent->sa_tls_rport = tls_rport != 0; agent->sa_preload = preload; agent->sa_tport_threadpool = threadpool; @@ -2064,7 +2069,8 @@ if (!v->v_rport && ((self->sa_rport && v->v_protocol == sip_transport_udp) || - (self->sa_tcp_rport && v->v_protocol == sip_transport_tcp))) + (self->sa_tcp_rport && v->v_protocol == sip_transport_tcp) || + (self->sa_tls_rport && v->v_protocol == sip_transport_tls))) msg_header_add_param(msg_home(msg), v->v_common, "rport"); if (!orq->orq_tpn->tpn_comp) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Tue Dec 16 15:10:32 2008 @@ -229,6 +229,8 @@ unsigned sa_server_rport:2; /** If true, use rport with tcp, too */ unsigned sa_tcp_rport:1; + /** If true, use rport with tls, too */ + unsigned sa_tls_rport:1; /** If true, automatically create compartments */ unsigned sa_auto_comp:1; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Tue Dec 16 15:10:32 2008 @@ -1298,7 +1298,7 @@ * * @note The NTATAG_RPORT() is a synonym for this. * - * @sa @RFC3581, NTATAG_SERVER_RPORT(), NTATAG_TCP_RPORT(), @Via + * @sa @RFC3581, NTATAG_SERVER_RPORT(), NTATAG_TCP_RPORT(), NTATAG_TLS_RPORT(), @Via */ tag_typedef_t ntatag_client_rport = BOOLTAG_TYPEDEF(client_rport); @@ -1333,7 +1333,7 @@ * - 1 - use "rport" parameter (default) * - 0 - do not use "rport" parameter * - * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via + * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), NTATAG_TLS_RPORT(), @Via */ tag_typedef_t ntatag_server_rport = INTTAG_TYPEDEF(server_rport); @@ -1358,6 +1358,27 @@ */ tag_typedef_t ntatag_tcp_rport = BOOLTAG_TYPEDEF(tcp_rport); +/**@def NTATAG_TLS_RPORT(x) + * + * Use rport with TLS, too. + * + * @par Used with + * nua_create(), nua_set_params(), + * nta_agent_create(), nta_agent_set_params() + * + * @par Parameter type + * boolean: true (non-zero or non-NULL pointer) + * or false (zero or NULL pointer) + * + * @par Values + * - true - include rport parameter in the TLS via line on client side + * - false - do not include rport parameter in the TLS via line + * on client side + * + * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_SERVER_RPORT(), @Via + */ +tag_typedef_t ntatag_tls_rport = BOOLTAG_TYPEDEF(tls_rport); + /**@def NTATAG_PRELOAD(x) * * Preload by N bytes. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h Tue Dec 16 15:10:32 2008 @@ -369,6 +369,12 @@ NTA_DLL extern tag_typedef_t ntatag_tcp_rport_ref; #define NTATAG_TCP_RPORT_REF(x) ntatag_tcp_rport_ref, tag_bool_vr(&(x)) +NTA_DLL extern tag_typedef_t ntatag_tls_rport; +#define NTATAG_TLS_RPORT(x) ntatag_tls_rport, tag_bool_v((x)) + +NTA_DLL extern tag_typedef_t ntatag_tls_rport_ref; +#define NTATAG_TLS_RPORT_REF(x) ntatag_tls_rport_ref, tag_bool_vr(&(x)) + NTA_DLL extern tag_typedef_t ntatag_preload; #define NTATAG_PRELOAD(x) ntatag_preload, tag_uint_v((x))

1 0

[commit] r10817 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 15:01:12 2008 New Revision: 10817 Log: Thu Dec 11 06:02:09 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sdp_print.c: print sdptl in lowercase, too Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 15:01:12 2008 @@ -1 +1 @@ -Tue Dec 16 13:58:31 CST 2008 +Tue Dec 16 13:59:44 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Tue Dec 16 15:01:12 2008 @@ -588,7 +588,7 @@ case sdp_proto_udp: proto = "udp"; break; case sdp_proto_rtp: proto = "RTP/AVP"; break; case sdp_proto_srtp: proto = "RTP/SAVP"; break; - case sdp_proto_udptl: proto = "UDPTL"; break; + case sdp_proto_udptl: proto = "udptl"; break; case sdp_proto_tls: proto = "tls"; break; default: proto = m->m_proto_name; break; }

1 0

[commit] r10816 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:58:49 2008 New Revision: 10816 Log: Wed Nov 12 12:00:29 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sdp_parse.c: use lower-case udptl According to T.38 V3.4 some implementations are case-sensitive when checking transport protocol name. Thanks to Timo Bruhn for the hint. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:58:49 2008 @@ -1 +1 @@ -Tue Dec 16 13:54:44 CST 2008 +Tue Dec 16 13:58:31 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Tue Dec 16 14:58:49 2008 @@ -1374,8 +1374,9 @@ m->m_proto = sdp_proto_rtp, m->m_proto_name = "RTP/AVP"; else if (strcasecmp(s, "RTP/SAVP") == 0) m->m_proto = sdp_proto_srtp, m->m_proto_name = "RTP/SAVP"; - else if (strcasecmp(s, "UDPTL") == 0) - m->m_proto = sdp_proto_udptl, m->m_proto_name = "UDPTL"; + else if (strcasecmp(s, "udptl") == 0) + /* Lower case - be compatible with people living by T.38 examples */ + m->m_proto = sdp_proto_udptl, m->m_proto_name = "udptl"; else if (strcasecmp(s, "UDP") == 0) m->m_proto = sdp_proto_udp, m->m_proto_name = "UDP"; else if (strcasecmp(s, "TCP") == 0)

1 0

[commit] r10815 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:55:04 2008 New Revision: 10815 Log: Thu Dec 11 11:32:13 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su_taglist.c. removed globals which should have been static in first place - t_null_next(), t_null_move(), t_null_dup(), t_null_copy(), t_null_find() - t_skip_next(), t_skip_move(), t_skip_len(), t_skip_dup(), t_skip_filter() - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:55:04 2008 @@ -1 +1 @@ -Tue Dec 16 13:52:51 CST 2008 +Tue Dec 16 13:54:44 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Tue Dec 16 14:55:04 2008 @@ -828,29 +828,27 @@ /* ====================================================================== */ /* null tag */ +static tagi_t const *t_null_next(tagi_t const *t) { return NULL; } +static tagi_t *t_null_move(tagi_t *dst, tagi_t const *src) { memset(dst, 0, sizeof(*dst)); return dst + 1; } +static tagi_t *t_null_dup(tagi_t *dst, tagi_t const *src, void **bb) { memset(dst, 0, sizeof(*dst)); return dst + 1; } -tagi_t *t_null_copy(tagi_t *dst, tagi_t const *src, void **bb) -{ - memset(dst, 0, sizeof(*dst)); - return dst + 1; -} - +static tagi_t const * t_null_find(tag_type_t tt, tagi_t const lst[]) { return NULL; @@ -919,26 +917,31 @@ /* ====================================================================== */ /* skip tag - placeholder in tag list */ +static tagi_t const *t_skip_next(tagi_t const *t) { return t + 1; } +static tagi_t *t_skip_move(tagi_t *dst, tagi_t const *src) { return dst; } +static size_t t_skip_len(tagi_t const *t) { return 0; } +static tagi_t *t_skip_dup(tagi_t *dst, tagi_t const *src, void **bb) { return dst; } +static tagi_t *t_skip_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src, @@ -968,11 +971,13 @@ /* ====================================================================== */ /* next tag - jump to next tag list */ +static tagi_t const *t_next_next(tagi_t const *t) { return (tagi_t *)(t->t_value); } +static tagi_t *t_next_move(tagi_t *dst, tagi_t const *src) { if (!src->t_value) @@ -980,6 +985,7 @@ return dst; } +static size_t t_next_len(tagi_t const *t) { if (!t->t_value) @@ -987,6 +993,7 @@ return 0; } +static tagi_t *t_next_dup(tagi_t *dst, tagi_t const *src, void **bb) { if (!src->t_value) @@ -994,6 +1001,7 @@ return dst; } +static tagi_t *t_next_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src, @@ -1023,6 +1031,7 @@ /* ====================================================================== */ /* filter tag - use function to filter tag */ +static tagi_t *t_filter_with(tagi_t *dst, tagi_t const *t, tagi_t const *src, @@ -1070,6 +1079,7 @@ /* ====================================================================== */ /* any tag - match to any tag when filtering */ +static tagi_t *t_any_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src,

1 0

[commit] r10814 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:53:46 2008 New Revision: 10814 Log: Mon Dec 8 08:59:04 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su: removed private functions accidentally declared as globals su_t64_to_time(), mutex_trylocker(), su_port_set_system_preferences() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:53:46 2008 @@ -1 +1 @@ -Tue Dec 16 13:51:53 CST 2008 +Tue Dec 16 13:52:51 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c Tue Dec 16 14:53:46 2008 @@ -37,6 +37,8 @@ #include "config.h" +#include <sofia-sip/heap.h> + #include <assert.h> #include <stdio.h> #include <sys/types.h> Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h Tue Dec 16 14:53:46 2008 @@ -111,6 +111,19 @@ SOFIAPUBFUN uint32_t su_ntp_fraq(su_time_t t); SOFIAPUBFUN uint32_t su_time_ms(su_time_t t); #else +su_inline uint32_t su_ntp_fraq(su_time_t t); +su_inline uint32_t su_time_ms(su_time_t t); +#endif + +SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo); + +SOFIAPUBFUN uint64_t su_counter(void); + +SOFIAPUBFUN uint64_t su_nanocounter(void); + +SOFIAPUBFUN uint32_t su_random(void); + +#if SU_HAVE_INLINE /** Middle 32 bit of NTP timestamp. */ su_inline uint32_t su_ntp_fraq(su_time_t t) { @@ -129,14 +142,6 @@ } #endif -SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo); - -SOFIAPUBFUN uint64_t su_counter(void); - -SOFIAPUBFUN uint64_t su_nanocounter(void); - -SOFIAPUBFUN uint32_t su_random(); - SOFIA_END_DECLS #endif /* !defined(SU_TIME_H) */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c Tue Dec 16 14:53:46 2008 @@ -57,7 +57,7 @@ return pthread_mutex_lock(mutex + 1); } -int mutex_trylocker(void *_mutex) +static int mutex_trylocker(void *_mutex) { pthread_mutex_t *mutex = _mutex; return pthread_mutex_trylock(mutex + 1); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c Tue Dec 16 14:53:46 2008 @@ -106,6 +106,7 @@ if (start) preferred_su_clone_start = start; } +static void su_port_set_system_preferences(char const *name) { su_port_create_f *create = preferred_su_port_create; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h Tue Dec 16 14:53:46 2008 @@ -168,6 +168,8 @@ SOFIAPUBFUN char const *su_port_name(su_port_t const *port); +SOFIAPUBFUN int su_timer_reset_all(su_timer_queue_t *, su_task_r ); + /* ---------------------------------------------------------------------- */ /* React to multiple events per one poll() to make sure Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Dec 16 14:53:46 2008 @@ -115,6 +115,14 @@ * Contains hint of number of sockets supported by su_root_t */ int su_root_size_hint = 64; +/* ====================================================================== */ + +_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port); +int su_task_attach(su_task_r self, su_root_t *root); +int su_task_detach(su_task_r self); + +int su_timer_reset_all(su_timer_t **t0, su_task_r); + /* ========================================================================= * Tasks */ @@ -348,12 +356,6 @@ } } -_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port); -int su_task_attach(su_task_r self, su_root_t *root); -int su_task_detach(su_task_r self); - -int su_timer_reset_all(su_timer_t **t0, su_task_r); - /* Note that is *not* necessary same as su_root_t, * as su_root_t can be extended */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c Tue Dec 16 14:53:46 2008 @@ -202,6 +202,8 @@ typedef uint64_t su_t64_t; /* time with 64 bits */ +static su_time_t su_t64_to_time(su_t64_t const us); + const uint32_t su_res32 = 1000000UL; const su_t64_t su_res64 = (su_t64_t)1000000UL; @@ -307,6 +309,7 @@ return (uint32_t) (ntp >> 16) & 0xffffffffLU; } +static su_time_t su_t64_to_time(su_t64_t const us) { su_time_t tv;

1 0

[commit] r10813 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:52:05 2008 New Revision: 10813 Log: Thu Dec 11 11:32:49 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su_uniqueid.h: proper prototype for su_random() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:52:05 2008 @@ -1 +1 @@ -Tue Dec 16 13:50:36 CST 2008 +Tue Dec 16 13:51:53 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h Tue Dec 16 14:52:05 2008 @@ -117,7 +117,7 @@ SOFIAPUBFUN void *su_randmem(void *mem, size_t siz); /** Generate a random 32-bit integer. */ -SOFIAPUBFUN uint32_t su_random(); +SOFIAPUBFUN uint32_t su_random(void); SOFIA_END_DECLS

1 0

[commit] r10812 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:50:56 2008 New Revision: 10812 Log: Thu Dec 11 11:30:29 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su/addrinfo.c, su/localinfo.c: made usage() static Make -Wmissing-prototypes happy. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:50:56 2008 @@ -1 +1 @@ -Tue Dec 16 13:48:18 CST 2008 +Tue Dec 16 13:50:36 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c Tue Dec 16 14:50:56 2008 @@ -84,7 +84,7 @@ int getopt(int argc, char * const argv[], char const *opstring); extern int optind; -void usage(void) +static void usage(void) { fputs(help, stderr); exit(1); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c Tue Dec 16 14:50:56 2008 @@ -110,7 +110,7 @@ int getopt(int argc, char * const argv[], char const *opstring); extern int optind; -void usage(int returncode) +static void usage(int returncode) { fputs(help, stderr); exit(returncode);

1 0