kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tue Dec 16 11:58:26 CST 2008 Jarod Neuner <janeuner@networkharbor.com> 

* Helper functions for vtp_connect and vtp_wakeup_pri.
  
  - Expose tport_setname() and tport_wakeup() via tport_internal.h
  - Add tport_register_secondary() for adding secondaries to a root, and
    to alleviate the need to export tprb_append.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11768 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-11 16:10:58 +00:00
parent 470a963e03
commit ece5252042
3 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Feb 11 10:03:28 CST 2009 Wed Feb 11 10:10:42 CST 2009

89
libs/sofia-sip/libsofia-sip-ua/tport/tport.c
View File

@ -399,9 +399,7 @@ static int
char const * const transports[], enum tport_via public, char const * const transports[], enum tport_via public,
tagi_t *tags), tagi_t *tags),
tport_setname(tport_t *, char const *, su_addrinfo_t const *, char const *),
tport_wakeup_pri(su_root_magic_t *m, su_wait_t *w, tport_t *self), tport_wakeup_pri(su_root_magic_t *m, su_wait_t *w, tport_t *self),
tport_wakeup(su_root_magic_t *m, su_wait_t *w, tport_t *self),
tport_base_wakeup(tport_t *self, int events), tport_base_wakeup(tport_t *self, int events),
tport_connected(su_root_magic_t *m, su_wait_t *w, tport_t *self), tport_connected(su_root_magic_t *m, su_wait_t *w, tport_t *self),
tport_resolve(tport_t *self, msg_t *msg, tp_name_t const *tpn), tport_resolve(tport_t *self, msg_t *msg, tp_name_t const *tpn),
@ -949,13 +947,10 @@ tport_t *tport_base_connect(tport_primary_t *pri,
su_addrinfo_t *real_ai, su_addrinfo_t *real_ai,
tp_name_t const *tpn) tp_name_t const *tpn)
{ {
tport_master_t *mr = pri->pri_master;
tport_t *self = NULL; tport_t *self = NULL;
su_socket_t s, server_socket; su_socket_t s, server_socket;
su_wait_t wait[1] = { SU_WAIT_INIT };
su_wakeup_f wakeup = tport_wakeup; su_wakeup_f wakeup = tport_wakeup;
int index = 0;
int events = SU_WAIT_IN | SU_WAIT_ERR; int events = SU_WAIT_IN | SU_WAIT_ERR;
int err; int err;
@ -967,7 +962,6 @@ tport_t *tport_base_connect(tport_primary_t *pri,
#define TPORT_CONNECT_ERROR(errno, what) \ #define TPORT_CONNECT_ERROR(errno, what) \
return \ return \
((void)(err = errno, \ ((void)(err = errno, \
su_wait_destroy(wait), \
(SU_LOG_LEVEL >= errlevel ? \ (SU_LOG_LEVEL >= errlevel ? \
su_llog(tport_log, errlevel, \ su_llog(tport_log, errlevel, \
"%s(%p): %s(pf=%d %s/%s): %s\n", \ "%s(%p): %s(pf=%d %s/%s): %s\n", \
@ -1013,7 +1007,7 @@ tport_t *tport_base_connect(tport_primary_t *pri,
TPORT_CONNECT_ERROR(su_errno(), tport_setname); TPORT_CONNECT_ERROR(su_errno(), tport_setname);
/* Try to have a non-blocking connect(). /* Try to have a non-blocking connect().
* The su_wait_create() below makes the socket non-blocking anyway. */ * The tport_register_secondary() below makes the socket non-blocking anyway. */
su_setblocking(s, 0); su_setblocking(s, 0);
if (connect(s, ai->ai_addr, (socklen_t)(ai->ai_addrlen)) == SOCKET_ERROR) { if (connect(s, ai->ai_addr, (socklen_t)(ai->ai_addrlen)) == SOCKET_ERROR) {
@ -1029,14 +1023,8 @@ tport_t *tport_base_connect(tport_primary_t *pri,
self->tp_is_connected = 1; self->tp_is_connected = 1;
} }
if (su_wait_create(wait, s, self->tp_events = events) == -1) if (tport_register_secondary(self, wakeup, events) == -1)
TPORT_CONNECT_ERROR(su_errno(), su_wait_create); TPORT_CONNECT_ERROR(su_errno(), tport_register_secondary);
/* Register receiving function with events specified above */
if ((index = su_root_register(mr->mr_root, wait, wakeup, self, 0)) == -1)
TPORT_CONNECT_ERROR(su_errno(), su_root_register);
self->tp_index = index;
if (ai == real_ai) { if (ai == real_ai) {
SU_DEBUG_5(("%s(%p): %s to " TPN_FORMAT "\n", SU_DEBUG_5(("%s(%p): %s to " TPN_FORMAT "\n",
@ -1049,11 +1037,35 @@ tport_t *tport_base_connect(tport_primary_t *pri,
TPN_ARGS(self->tp_name))); TPN_ARGS(self->tp_name)));
} }
tprb_append(&pri->pri_open, self);
return self; return self;
} }
/** Register a new secondary transport. @internal */
int tport_register_secondary(tport_t *self, su_wakeup_f wakeup, int events)
{
int i;
su_root_t *root = tport_is_secondary(self) ? self->tp_master->mr_root : NULL;
su_wait_t wait[1] = { SU_WAIT_INIT };
if (root != NULL
/* Create wait object with appropriate events. */
&&
su_wait_create(wait, self->tp_socket, events) != -1
/* Register socket to root */
&&
(i = su_root_register(root, wait, wakeup, self, 0)) != -1) {
self->tp_index = i;
self->tp_events = events;
tprb_append(&self->tp_pri->pri_open, self);
return 0;
}
su_wait_destroy(wait);
return -1;
}
/** Destroy a secondary transport. @internal */ /** Destroy a secondary transport. @internal */
void tport_zap_secondary(tport_t *self) void tport_zap_secondary(tport_t *self)
{ {
@ -2351,7 +2363,6 @@ int tport_convert_addr(su_home_t *home,
/** Set transport object name. @internal /** Set transport object name. @internal
*/ */
static
int tport_setname(tport_t *self, int tport_setname(tport_t *self,
char const *protoname, char const *protoname,
su_addrinfo_t const *ai, su_addrinfo_t const *ai,
@ -2577,48 +2588,38 @@ int tport_accept(tport_primary_t *pri, int events)
ai->ai_addr = &su->su_sa, ai->ai_addrlen = sulen; ai->ai_addr = &su->su_sa, ai->ai_addrlen = sulen;
/* Alloc a new transport object, then register socket events with it */ /* Alloc a new transport object, then register socket events with it */
self = tport_alloc_secondary(pri, s, 1, &reason); if ((self = tport_alloc_secondary(pri, s, 1, &reason)) == NULL) {
SU_DEBUG_3(("%s(%p): incoming secondary on "TPN_FORMAT
if (self) { " failed. reason = %s\n", __func__, pri,
int i; TPN_ARGS(pri->pri_primary->tp_name), reason));
su_root_t *root = self->tp_master->mr_root; return 0;
su_wakeup_f wakeup = tport_wakeup; }
else {
int events = SU_WAIT_IN|SU_WAIT_ERR|SU_WAIT_HUP; int events = SU_WAIT_IN|SU_WAIT_ERR|SU_WAIT_HUP;
su_wait_t wait[1] = { SU_WAIT_INIT };
SU_CANONIZE_SOCKADDR(su); SU_CANONIZE_SOCKADDR(su);
if (/* Create wait object with appropriate events. */ if (/* Name this transport */
su_wait_create(wait, s, events) != -1 tport_setname(self, pri->pri_protoname, ai, NULL) != -1
/* Register socket to root */ /* Register this secondary */
&& &&
(i = su_root_register(root, wait, wakeup, self, 0)) != -1) { tport_register_secondary(self, tport_wakeup, events) != -1) {
self->tp_index = i;
self->tp_conn_orient = 1; self->tp_conn_orient = 1;
self->tp_is_connected = 1; self->tp_is_connected = 1;
self->tp_events = events;
if (tport_setname(self, pri->pri_protoname, ai, NULL) != -1) { SU_DEBUG_5(("%s(%p): new connection from " TPN_FORMAT "\n",
SU_DEBUG_5(("%s(%p): new connection from " TPN_FORMAT "\n", __func__, (void *)self, TPN_ARGS(self->tp_name)));
__func__, (void *)self, TPN_ARGS(self->tp_name)));
tprb_append(&pri->pri_open, self); return 0;
/* Return succesfully */
return 0;
}
} }
else
su_wait_destroy(wait);
/* Failure: shutdown socket, */ /* Failure: shutdown socket, */
tport_close(self); tport_close(self);
tport_zap_secondary(self); tport_zap_secondary(self);
self = NULL;
} }
/* XXX - report error ? */
return 0; return 0;
} }
@ -2727,7 +2728,7 @@ static int tport_wakeup_pri(su_root_magic_t *m, su_wait_t *w, tport_t *self)
} }
/** Process events for connected socket */ /** Process events for connected socket */
static int tport_wakeup(su_root_magic_t *magic, su_wait_t *w, tport_t *self) int tport_wakeup(su_root_magic_t *magic, su_wait_t *w, tport_t *self)
{ {
int events = su_wait_events(w, self->tp_socket); int events = su_wait_events(w, self->tp_socket);

4
libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
View File

@ -409,6 +409,7 @@ tport_t *tport_alloc_secondary(tport_primary_t *pri,
char const **return_reason); char const **return_reason);
int tport_accept(tport_primary_t *pri, int events); int tport_accept(tport_primary_t *pri, int events);
int tport_register_secondary(tport_t *self, su_wakeup_f wakeup, int events);
void tport_zap_secondary(tport_t *self); void tport_zap_secondary(tport_t *self);
int tport_set_secondary_timer(tport_t *self); int tport_set_secondary_timer(tport_t *self);
@ -426,6 +427,9 @@ int tport_error_event(tport_t *self);
void tport_recv_event(tport_t *self); void tport_recv_event(tport_t *self);
void tport_send_event(tport_t *self); void tport_send_event(tport_t *self);
void tport_hup_event(tport_t *self); void tport_hup_event(tport_t *self);
int tport_setname(tport_t *, char const *, su_addrinfo_t const *, char const *);
int tport_wakeup(su_root_magic_t *magic, su_wait_t *w, tport_t *self);
ssize_t tport_recv_iovec(tport_t const *self, ssize_t tport_recv_iovec(tport_t const *self,
msg_t **mmsg, msg_t **mmsg,