typedef struct tango {
struct tango *next, *prev; /* A big list of all tangos */
endpt *a, *b; /* The two endpoints */
+ char *desc; /* Description of the connection */
unsigned s; /* State of the connection */
chanpair *c; /* The pair of channels */
} tango;
*/
if (a->f & b->f & EPF_FILE) {
+ if (t->c->ab.err)
+ fw_log(NOW, "[%s] error: %s", t->desc, strerror(t->c->ab.err));
+ else if (t->c->ba.err)
+ fw_log(NOW, "[%s] error: %s", t->desc, strerror(t->c->ba.err));
if (t->s & EPS_AB)
chan_close(&t->c->ab);
if (!(b->f & EPF_PENDING) && (t->s & EPS_BA))
t->prev->next = t->next;
else
tangos = t->next;
+ if (t->desc)
+ xfree(t->desc);
DESTROY(t);
}
*
* Arguments: @endpt *a@ = pointer to first endpoint
* @endpt *b@ = pointer to second endpoint
+ * @const char *desc@ = description of connection
*
* Returns: ---
*
* which are already joined; in fact, the the right thing to do
* when your endpoint decides that it's not pending any more is
* to join it to its partner again.
+ *
+ * If the endpoints are already connected then the description
+ * string is ignored. The endpoint manager takes a copy of the
+ * string, so you don't need to keep it around.
*/
-void endpt_join(endpt *a, endpt *b)
+void endpt_join(endpt *a, endpt *b, const char *desc)
{
tango *t = a->t;
a->t = b->t = t;
t->s = EPS_AB | EPS_BA;
t->c = 0;
+ t->desc = xstrdup(desc);
if (tangos)
tangos->prev = t;
tangos = t;