Commit 2ff3a96b authored by Pekka Pessi's avatar Pekka Pessi

Removed separate virtual function for compression initialization.

darcs-hash:20060327135317-88462-550f1dabc010e01eb080206991d3adad10f0e1b3.gz
parent 77df9875
......@@ -579,9 +579,6 @@ tport_primary_t *tport_alloc_primary(tport_master_t *mr,
else if (tpn->tpn_ident &&
!(tp->tp_name->tpn_ident = su_strdup(tp->tp_home, tpn->tpn_ident)))
*return_culprit = "alloc ident";
else if (vtable->vtp_init_compression && tpn->tpn_comp &&
vtable->vtp_init_compression(pri, tpn->tpn_comp, tags) < 0)
*return_culprit = "init compression";
else
return pri; /* Success */
......
......@@ -338,8 +338,6 @@ struct tport_vtable
tp_name_t const tpn[1],
su_addrinfo_t *ai, tagi_t const *,
char const **return_culprit);
int (*vtp_init_compression)(tport_primary_t *self, char const *compression,
tagi_t const *tl);
void (*vtp_deinit_primary)(tport_primary_t *pri);
int (*vtp_wakeup_pri)(tport_primary_t *pri, int events);
tport_t *(*vtp_connect)(tport_primary_t *pri, su_addrinfo_t *ai,
......
......@@ -96,7 +96,6 @@ tport_vtable_t const tport_tcp_vtable_for_sigcomp =
"tcp", tport_type_local,
sizeof (tport_primary_t),
tport_tcp_init_primary,
tport_init_compression,
NULL,
tport_accept,
NULL,
......@@ -116,7 +115,6 @@ tport_vtable_t const tport_tcp_client_vtable_for_sigcomp =
"tcp", tport_type_client,
sizeof (tport_primary_t),
tport_tcp_init_client,
tport_init_compression,
NULL,
tport_accept,
NULL,
......
......@@ -119,7 +119,6 @@ tport_vtable_t const tport_threadpool_vtable =
"udp", tport_type_local,
sizeof (tport_primary_t),
tport_threadpool_init_primary,
tport_init_compression,
tport_threadpool_deinit_primary,
NULL,
NULL,
......
......@@ -79,7 +79,6 @@ tport_vtable_t const tport_http_connect_vtable =
"TCP", tport_type_connect,
sizeof (tport_http_connect_t),
tport_http_connect_init_primary,
NULL,
tport_http_connect_deinit_primary,
NULL,
tport_http_connect,
......
......@@ -75,7 +75,6 @@ tport_vtable_t const tport_sctp_client_vtable =
sizeof (tport_primary_t),
tport_sctp_init_client,
NULL,
NULL,
tport_accept,
NULL,
sizeof (tport_t),
......@@ -97,7 +96,6 @@ tport_vtable_t const tport_sctp_vtable =
sizeof (tport_primary_t),
tport_sctp_init_primary,
NULL,
NULL,
tport_accept,
NULL,
sizeof (tport_t),
......
......@@ -98,7 +98,7 @@ static int tport_udp_init_stun(tport_primary_t *,
typedef struct
{
tport_primary_t stuntp_primary[1];
tport_primary_t stun_primary[1];
int stun_try;
char *stun_server;
stun_handle_t *stun_handle;
......@@ -110,9 +110,8 @@ tport_vtable_t const tport_stun_vtable =
{
"UDP", tport_type_stun,
sizeof (tport_stun_t),
tport_stun_init_primary,
tport_init_compression,
tport_stun_deinit_primary,
tport_udp_init_stun,
tport_udp_deinit_stun,
NULL,
NULL,
sizeof (tport_t),
......
......@@ -58,7 +58,6 @@ tport_vtable_t const tport_tcp_vtable =
"tcp", tport_type_local,
sizeof (tport_primary_t),
tport_tcp_init_primary,
tport_init_compression,
NULL,
tport_accept,
NULL,
......@@ -77,7 +76,6 @@ tport_vtable_t const tport_tcp_client_vtable =
"tcp", tport_type_client,
sizeof (tport_primary_t),
tport_tcp_init_client,
tport_init_compression,
NULL,
tport_accept,
NULL,
......
......@@ -92,7 +92,6 @@ tport_vtable_t const tport_tls_vtable =
"tls", tport_type_local,
sizeof (tport_tls_primary_t),
tport_tls_init_primary,
NULL,
tport_tls_deinit_primary,
tport_accept,
NULL,
......@@ -111,7 +110,6 @@ tport_vtable_t const tport_tls_client_vtable =
"tls", tport_type_client,
sizeof (tport_tls_primary_t),
tport_tls_init_client,
NULL,
tport_tls_deinit_primary,
tport_accept,
NULL,
......
......@@ -61,7 +61,6 @@ tport_vtable_t const tport_udp_client_vtable =
"udp", tport_type_client,
sizeof (tport_primary_t),
NULL,
tport_init_compression,
NULL,
NULL,
NULL,
......@@ -80,7 +79,6 @@ tport_vtable_t const tport_udp_vtable =
"udp", tport_type_local,
sizeof (tport_primary_t),
tport_udp_init_primary,
tport_init_compression,
NULL,
NULL,
NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment