Commit 75042a4d authored by Pekka Pessi's avatar Pekka Pessi

Removee v-p from the vtable names.

darcs-hash:20060324160827-88462-65930fa703498def4e9e349f4ec7e6fb34cbbd70.gz
parent 313f9eed
......@@ -1138,35 +1138,35 @@ int tport_set_params(tport_t *self,
return n;
}
extern tport_vtable_t const tport_udp_vtable_;
extern tport_vtable_t const tport_tcp_vtable_;
extern tport_vtable_t const tport_tls_vtable_;
extern tport_vtable_t const tport_sctp_vtable_;
extern tport_vtable_t const tport_udp_client_vtable_;
extern tport_vtable_t const tport_tcp_client_vtable_;
extern tport_vtable_t const tport_sctp_client_vtable_;
extern tport_vtable_t const tport_tls_client_vtable_;
extern tport_vtable_t const tport_http_connect_vtable_;
extern tport_vtable_t const tport_threadpool_vtable_;
extern tport_vtable_t const tport_udp_vtable;
extern tport_vtable_t const tport_tcp_vtable;
extern tport_vtable_t const tport_tls_vtable;
extern tport_vtable_t const tport_sctp_vtable;
extern tport_vtable_t const tport_udp_client_vtable;
extern tport_vtable_t const tport_tcp_client_vtable;
extern tport_vtable_t const tport_sctp_client_vtable;
extern tport_vtable_t const tport_tls_client_vtable;
extern tport_vtable_t const tport_http_connect_vtable;
extern tport_vtable_t const tport_threadpool_vtable;
#define TPORT_NUMBER_OF_TYPES 64
tport_vtable_t const *tport_vtables[TPORT_NUMBER_OF_TYPES + 1] =
{
&tport_http_connect_vtable_,
&tport_http_connect_vtable,
#if HAVE_TLS
&tport_tls_client_vtable_,
&tport_tls_vtable_,
&tport_tls_client_vtable,
&tport_tls_vtable,
#endif
#if HAVE_SCTP
&tport_sctp_client_vtable_,
&tport_sctp_vtable_,
&tport_sctp_client_vtable,
&tport_sctp_vtable,
#endif
&tport_tcp_client_vtable_,
&tport_tcp_vtable_,
&tport_udp_client_vtable_,
&tport_udp_vtable_,
&tport_threadpool_vtable_,
&tport_tcp_client_vtable,
&tport_tcp_vtable,
&tport_udp_client_vtable,
&tport_udp_vtable,
&tport_threadpool_vtable,
};
/**Get a vtable for given protocol */
......
......@@ -428,8 +428,8 @@ void tport_dump_iovec(tport_t const *self, msg_t *msg,
int n, su_iovec_t const iov[], int iovused,
char const *what, char const *how);
extern tport_vtable_t const * const tport_udp_vtable;
extern tport_vtable_t const * const tport_udp_client_vtable;
extern tport_vtable_t const tport_udp_vtable;
extern tport_vtable_t const tport_udp_client_vtable;
int tport_udp_init_primary(tport_primary_t *,
tp_name_t const tpn[1],
......@@ -442,8 +442,8 @@ int tport_send_dgram(tport_t const *self, msg_t *msg,
msg_iovec_t iov[], int iovused);
int tport_udp_error(tport_t const *self, su_sockaddr_t name[1]);
extern tport_vtable_t const * const tport_tcp_vtable;
extern tport_vtable_t const * const tport_tcp_client_vtable;
extern tport_vtable_t const tport_tcp_vtable;
extern tport_vtable_t const tport_tcp_client_vtable;
int tport_tcp_init_primary(tport_primary_t *,
tp_name_t const tpn[1],
......@@ -458,13 +458,13 @@ int tport_recv_stream(tport_t *self);
int tport_send_stream(tport_t const *self, msg_t *msg,
msg_iovec_t iov[], int iovused);
extern tport_vtable_t const * const tport_sctp_vtable;
extern tport_vtable_t const * const tport_sctp_client_vtable;
extern tport_vtable_t const * const tport_tls_vtable;
extern tport_vtable_t const * const tport_tls_client_vtable;
extern tport_vtable_t const * const tport_stun_vtable;
extern tport_vtable_t const * const tport_http_connect_vtable;
extern tport_vtable_t const * const tport_threadpool_vtable;
extern tport_vtable_t const tport_sctp_vtable;
extern tport_vtable_t const tport_sctp_client_vtable;
extern tport_vtable_t const tport_tls_vtable;
extern tport_vtable_t const tport_tls_client_vtable;
extern tport_vtable_t const tport_stun_vtable;
extern tport_vtable_t const tport_http_connect_vtable;
extern tport_vtable_t const tport_threadpool_vtable;
SOFIA_END_DECLS
......
......@@ -114,7 +114,7 @@ static int tport_thread_send(tport_t *tp,
struct sigcomp_compartment *cc,
unsigned mtu);
tport_vtable_t const tport_threadpool_vtable_ =
tport_vtable_t const tport_threadpool_vtable =
{
"udp", tport_type_local,
sizeof (tport_primary_t),
......
......@@ -74,7 +74,7 @@ typedef struct
msg_t *thci_stackmsg;
} tport_http_connect_instance_t;
tport_vtable_t const tport_http_connect_vtable_ =
tport_vtable_t const tport_http_connect_vtable =
{
"TCP", tport_type_connect,
sizeof (tport_http_connect_t),
......@@ -94,9 +94,6 @@ tport_vtable_t const tport_http_connect_vtable_ =
tport_http_deliver,
};
tport_vtable_t const * const tport_http_connect_vtable =
&tport_http_connect_vtable_;
static int tport_http_connect_init_primary(tport_primary_t *pri,
tp_name_t const tpn[1],
su_addrinfo_t *ai,
......
......@@ -69,7 +69,7 @@ static int tport_recv_sctp(tport_t *self);
static int tport_send_sctp(tport_t const *self, msg_t *msg,
msg_iovec_t iov[], int iovused);
tport_vtable_t const tport_sctp_client_vtable_ =
tport_vtable_t const tport_sctp_client_vtable =
{
"sctp", tport_type_client,
sizeof (tport_primary_t),
......@@ -91,7 +91,7 @@ tport_vtable_t const tport_sctp_client_vtable_ =
#undef NEXT_VTABLE
#define NEXT_VTABLE &tport_sctp_client_vtable
tport_vtable_t const tport_sctp_vtable_ =
tport_vtable_t const tport_sctp_vtable =
{
"sctp", tport_type_local,
sizeof (tport_primary_t),
......
......@@ -106,7 +106,7 @@ typedef struct
su_sockaddr_t stun_sockaddr;
} tport_stun_t;
tport_vtable_t const tport_stun_vtable_ =
tport_vtable_t const tport_stun_vtable =
{
"UDP", tport_type_stun,
sizeof (tport_stun_t),
......
......@@ -53,7 +53,7 @@
/* ---------------------------------------------------------------------- */
/* TCP */
tport_vtable_t const tport_tcp_vtable_ =
tport_vtable_t const tport_tcp_vtable =
{
"tcp", tport_type_local,
sizeof (tport_primary_t),
......@@ -72,7 +72,7 @@ tport_vtable_t const tport_tcp_vtable_ =
tport_send_stream,
};
tport_vtable_t const tport_tcp_client_vtable_ =
tport_vtable_t const tport_tcp_client_vtable =
{
"tcp", tport_type_client,
sizeof (tport_primary_t),
......
......@@ -87,7 +87,7 @@ typedef struct
char *tlstp_buffer; /**< 2k Buffer */
} tport_tls_t;
tport_vtable_t const tport_tls_vtable_ =
tport_vtable_t const tport_tls_vtable =
{
"tls", tport_type_local,
sizeof (tport_tls_primary_t),
......@@ -106,7 +106,7 @@ tport_vtable_t const tport_tls_vtable_ =
tport_tls_send,
};
tport_vtable_t const tport_tls_client_vtable_ =
tport_vtable_t const tport_tls_client_vtable =
{
"tls", tport_type_client,
sizeof (tport_tls_primary_t),
......
......@@ -56,7 +56,7 @@
static int tport_recv_stun_dgram(tport_t const *self, int N);
static int tport_recv_sigcomp_dgram(tport_t *self, int N);
tport_vtable_t const tport_udp_client_vtable_ =
tport_vtable_t const tport_udp_client_vtable =
{
"udp", tport_type_client,
sizeof (tport_primary_t),
......@@ -75,7 +75,7 @@ tport_vtable_t const tport_udp_client_vtable_ =
tport_send_dgram,
};
tport_vtable_t const tport_udp_vtable_ =
tport_vtable_t const tport_udp_vtable =
{
"udp", tport_type_local,
sizeof (tport_primary_t),
......
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