X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=trp%2Ftrp_ptable.c;h=4cb0705d01eac92c853d2b8a1d6cc4d8d0ed4a3e;hb=f98d872ef431521d9b39b1a362c4697be7f31c04;hp=9814f661533d9c7f6c8779ee13788032f0710f30;hpb=8503060a4ce1b8431bcade6bac913236d980eaf3;p=trust_router.git diff --git a/trp/trp_ptable.c b/trp/trp_ptable.c index 9814f66..4cb0705 100644 --- a/trp/trp_ptable.c +++ b/trp/trp_ptable.c @@ -1,18 +1,53 @@ +/* + * Copyright (c) 2016, JANET(UK) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + #include #include #include #include +#include #include #include static int trp_peer_destructor(void *object) { TRP_PEER *peer=talloc_get_type_abort(object, TRP_PEER); + if (peer->label!=NULL) + tr_free_name(peer->label); if (peer->servicename!=NULL) tr_free_name(peer->servicename); - if (peer->gssname!=NULL) - tr_free_name(peer->gssname); return 0; } TRP_PEER *trp_peer_new(TALLOC_CTX *memctx) @@ -20,12 +55,18 @@ TRP_PEER *trp_peer_new(TALLOC_CTX *memctx) TRP_PEER *peer=talloc(memctx, TRP_PEER); if (peer!=NULL) { peer->next=NULL; + peer->label=NULL; peer->server=NULL; peer->servicename=NULL; - peer->gssname=NULL; + peer->gss_names=NULL; peer->port=0; peer->linkcost=TRP_LINKCOST_DEFAULT; peer->last_conn_attempt=(struct timespec){0,0}; + peer->outgoing_status=PEER_DISCONNECTED; + peer->incoming_status=PEER_DISCONNECTED; + peer->conn_status_cb=NULL; + peer->conn_status_cookie=NULL; + peer->filter=NULL; talloc_set_destructor((void *)peer, trp_peer_destructor); } return peer; @@ -44,6 +85,30 @@ static TRP_PEER *trp_peer_tail(TRP_PEER *peer) return peer; } + +/* Get a name that identifies this peer for display to the user, etc. + * Do not modify or free the label. */ +TR_NAME *trp_peer_get_label(TRP_PEER *peer) +{ + char *s=NULL; + + if (peer->label==NULL) { + s=talloc_asprintf(NULL, "%s:%u", peer->server, peer->port); + if (s!=NULL) { + peer->label=tr_new_name(s); + talloc_free(s); + } + } + return peer->label; +} + +/* Get a name that identifies this peer for display to the user, etc. + * Makes a copy, caller is responsible for freeing. */ +TR_NAME *trp_peer_dup_label(TRP_PEER *peer) +{ + return tr_dup_name(trp_peer_get_label(peer));; +} + char *trp_peer_get_server(TRP_PEER *peer) { return peer->server; @@ -66,28 +131,33 @@ static void trp_peer_set_servicename(TRP_PEER *peer, const char *server) } } -/* copies input; on error, peer->gssname will be null */ -void trp_peer_set_server(TRP_PEER *peer, char *server) +/* copies input; on error, peer->servicename will be null */ +void trp_peer_set_server(TRP_PEER *peer, const char *server) { peer->server=talloc_strdup(peer, server); /* will be null on error */ trp_peer_set_servicename(peer, server); } -void trp_peer_set_gssname(TRP_PEER *peer, TR_NAME *gssname) +void trp_peer_add_gss_name(TRP_PEER *peer, TR_NAME *gss_name) { - peer->gssname=gssname; + if (peer->gss_names==NULL) + trp_peer_set_gss_names(peer, tr_gss_names_new(peer)); + tr_gss_names_add(peer->gss_names, gss_name); } -/* get the peer gssname, caller must not free the result */ -TR_NAME *trp_peer_get_gssname(TRP_PEER *peer) +void trp_peer_set_gss_names(TRP_PEER *peer, TR_GSS_NAMES *gss_names) { - return peer->gssname; + if (peer->gss_names!=NULL) + tr_gss_names_free(peer->gss_names); + + peer->gss_names=gss_names; + talloc_steal(peer, gss_names); } -/* get a copy of the peer gssname, caller must free via tr_free_name() */ -TR_NAME *trp_peer_dup_gssname(TRP_PEER *peer) +/* get the peer gss_names, caller must not free the result */ +TR_GSS_NAMES *trp_peer_get_gss_names(TRP_PEER *peer) { - return tr_dup_name(peer->gssname); + return peer->gss_names; } /* get the service name (i.e., gssname we see when we connect to this peer) */ @@ -131,6 +201,33 @@ void trp_peer_set_linkcost(TRP_PEER *peer, unsigned int linkcost) peer->linkcost=linkcost; } +void trp_peer_set_conn_status_cb(TRP_PEER *peer, void (*cb)(TRP_PEER *, void *), void *cookie) +{ + peer->conn_status_cb=cb; + peer->conn_status_cookie=cookie; +} + +/** + * Set the filter associated with this peer. Any existing filter will be freed. Takes responsibility for + * freeing the new filter. + * + * @param peer Peer to modify + * @param filt New filter to attach to the peer + */ +void trp_peer_set_filter(TRP_PEER *peer, TR_FILTER *filt) +{ + if (peer->filter!=NULL) + tr_filter_free(peer->filter); + + peer->filter=filt; + talloc_steal(peer, filt); +} + +TR_FILTER *trp_peer_get_filter(TRP_PEER *peer) +{ + return peer->filter; +} + struct timespec *trp_peer_get_last_conn_attempt(TRP_PEER *peer) { return &(peer->last_conn_attempt); @@ -150,6 +247,43 @@ TRP_PTABLE *trp_ptable_new(TALLOC_CTX *memctx) return ptbl; } +void trp_peer_set_outgoing_status(TRP_PEER *peer, TRP_PEER_CONN_STATUS status) +{ + TR_NAME *peer_label=trp_peer_get_label(peer); + int was_connected=trp_peer_is_connected(peer); + peer->outgoing_status=status; + tr_debug("trp_peer_set_outgoing_status: %s: status=%d peer connected was %d now %d.", + peer_label->buf, status, was_connected, trp_peer_is_connected(peer)); + if ((trp_peer_is_connected(peer) != was_connected) && (peer->conn_status_cb!=NULL)) + peer->conn_status_cb(peer, peer->conn_status_cookie); +} + +TRP_PEER_CONN_STATUS trp_peer_get_outgoing_status(TRP_PEER *peer) +{ + return peer->outgoing_status; +} + +void trp_peer_set_incoming_status(TRP_PEER *peer, TRP_PEER_CONN_STATUS status) +{ + TR_NAME *peer_label=trp_peer_get_label(peer); + int was_connected=trp_peer_is_connected(peer); + peer->incoming_status=status; + tr_debug("trp_peer_set_incoming_status: %s: status=%d peer connected was %d now %d.", + peer_label->buf, status, was_connected, trp_peer_is_connected(peer)); + if ((trp_peer_is_connected(peer) != was_connected) && (peer->conn_status_cb!=NULL)) + peer->conn_status_cb(peer, peer->conn_status_cookie); +} + +TRP_PEER_CONN_STATUS trp_peer_get_incoming_status(TRP_PEER *peer) +{ + return peer->incoming_status; +} + +int trp_peer_is_connected(TRP_PEER *peer) +{ + return (peer->outgoing_status==PEER_CONNECTED) && (peer->incoming_status==PEER_CONNECTED); +} + void trp_ptable_free(TRP_PTABLE *ptbl) { talloc_free(ptbl); @@ -157,12 +291,12 @@ void trp_ptable_free(TRP_PTABLE *ptbl) TRP_RC trp_ptable_add(TRP_PTABLE *ptbl, TRP_PEER *newpeer) { - if (ptbl->head==NULL) { + if (ptbl->head==NULL) ptbl->head=newpeer; - } else { + else trp_peer_tail(ptbl->head)->next=newpeer; - talloc_steal(ptbl, newpeer); - } + + talloc_steal(ptbl, newpeer); return TRP_SUCCESS; } @@ -191,10 +325,10 @@ TRP_RC trp_ptable_remove(TRP_PTABLE *ptbl, TRP_PEER *peer) return TRP_ERROR; } -TRP_PEER *trp_ptable_find_gssname(TRP_PTABLE *ptbl, TR_NAME *gssname) +TRP_PEER *trp_ptable_find_gss_name(TRP_PTABLE *ptbl, TR_NAME *gssname) { TRP_PEER *cur=ptbl->head; - while ((cur!=NULL) && (0 != tr_name_cmp(trp_peer_get_gssname(cur), gssname))) + while ((cur!=NULL) && (!tr_gss_names_matches(trp_peer_get_gss_names(cur), gssname))) cur=cur->next; return cur; } @@ -246,13 +380,17 @@ TRP_PTABLE_ITER *trp_ptable_iter_new(TALLOC_CTX *mem_ctx) TRP_PEER *trp_ptable_iter_first(TRP_PTABLE_ITER *iter, TRP_PTABLE *ptbl) { - *iter=ptbl->head; + if (ptbl==NULL) + *iter=NULL; + else + *iter=ptbl->head; return *iter; } TRP_PEER *trp_ptable_iter_next(TRP_PTABLE_ITER *iter) { - *iter=(*iter)->next; + if (*iter!=NULL) + *iter=(*iter)->next; return *iter; }