From fac4ab6d5d54cc52908d52828fea01cda52c6415 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 26 Jun 2009 19:54:39 +0000 Subject: [PATCH] Wed Jun 3 12:25:35 CDT 2009 Pekka Pessi * tport_type_tls.c: added field names to tport_vtable_t initialization git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13985 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- .../libsofia-sip-ua/tport/tport_type_tls.c | 70 +++++++++++-------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index d8d870fa6c..1bb752eb7a 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Thu Jun 25 13:46:21 CDT 2009 +Fri Jun 26 14:53:27 CDT 2009 diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c index 89f65a892d..a1f0adf1fe 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c @@ -98,38 +98,52 @@ static tport_t *tport_tls_connect(tport_primary_t *pri, su_addrinfo_t *ai, tport_vtable_t const tport_tls_vtable = { - "tls", tport_type_local, - sizeof (tport_tls_primary_t), - tport_tls_init_primary, - tport_tls_deinit_primary, - tport_tls_accept, - tport_tls_connect, - sizeof (tport_tls_t), - tport_tls_init_secondary, - tport_tls_deinit_secondary, - tport_tls_shutdown, - tport_tls_set_events, - tport_tls_events, - tport_tls_recv, - tport_tls_send, + /* vtp_name */ "tls", + /* vtp_public */ tport_type_local, + /* vtp_pri_size */ sizeof (tport_tls_primary_t), + /* vtp_init_primary */ tport_tls_init_primary, + /* vtp_deinit_primary */ tport_tls_deinit_primary, + /* vtp_wakeup_pri */ tport_tls_accept, + /* vtp_connect */ tport_tls_connect, + /* vtp_secondary_size */ sizeof (tport_tls_t), + /* vtp_init_secondary */ tport_tls_init_secondary, + /* vtp_deinit_secondary */ tport_tls_deinit_secondary, + /* vtp_shutdown */ tport_tls_shutdown, + /* vtp_set_events */ tport_tls_set_events, + /* vtp_wakeup */ tport_tls_events, + /* vtp_recv */ tport_tls_recv, + /* vtp_send */ tport_tls_send, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; tport_vtable_t const tport_tls_client_vtable = { - "tls", tport_type_client, - sizeof (tport_tls_primary_t), - tport_tls_init_client, - tport_tls_deinit_primary, - tport_tls_accept, - tport_tls_connect, - sizeof (tport_tls_t), - tport_tls_init_secondary, - tport_tls_deinit_secondary, - tport_tls_shutdown, - tport_tls_set_events, - tport_tls_events, - tport_tls_recv, - tport_tls_send, + /* vtp_name */ "tls", + /* vtp_public */ tport_type_client, + /* vtp_pri_size */ sizeof (tport_tls_primary_t), + /* vtp_init_primary */ tport_tls_init_client, + /* vtp_deinit_primary */ tport_tls_deinit_primary, + /* vtp_wakeup_pri */ tport_tls_accept, + /* vtp_connect */ tport_tls_connect, + /* vtp_secondary_size */ sizeof (tport_tls_t), + /* vtp_init_secondary */ tport_tls_init_secondary, + /* vtp_deinit_secondary */ tport_tls_deinit_secondary, + /* vtp_shutdown */ tport_tls_shutdown, + /* vtp_set_events */ tport_tls_set_events, + /* vtp_wakeup */ tport_tls_events, + /* vtp_recv */ tport_tls_recv, + /* vtp_send */ tport_tls_send, + /* vtp_deliver */ NULL, + /* vtp_prepare */ NULL, + /* vtp_keepalive */ NULL, + /* vtp_stun_response */ NULL, + /* vtp_next_secondary_timer*/ NULL, + /* vtp_secondary_timer */ NULL, }; static int tport_tls_init_primary(tport_primary_t *pri,