+/*
+ * 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 <fcntl.h>
#include <talloc.h>
#include <errno.h>
#include <tr_debug.h>
#include <trp_internal.h>
+static int trpc_destructor(void *object)
+{
+ TRPC_INSTANCE *trpc=talloc_get_type_abort(object, TRPC_INSTANCE);
+ if (trpc->gssname!=NULL)
+ tr_free_name(trpc->gssname);
+ return 0;
+}
/* also allocates the incoming mq */
TRPC_INSTANCE *trpc_new (TALLOC_CTX *mem_ctx)
trpc->server=NULL;
trpc->port=0;
trpc->conn=NULL;
- trpc->dh=NULL;
trpc->mq=tr_mq_new(trpc);
if (trpc->mq==NULL) {
talloc_free(trpc);
trpc=NULL;
- }
+ } else
+ talloc_set_destructor((void *)trpc, trpc_destructor);
+
}
return trpc;
}
trpc_set_next(trpc_get_tail(trpc), new);
}
-const char *trpc_get_server(TRPC_INSTANCE *trpc)
+char *trpc_get_server(TRPC_INSTANCE *trpc)
{
return trpc->server;
}
-void trpc_set_server(TRPC_INSTANCE *trpc, const char *server)
+void trpc_set_server(TRPC_INSTANCE *trpc, char *server)
{
trpc->server=server;
}
+TR_NAME *trpc_get_gssname(TRPC_INSTANCE *trpc)
+{
+ return trpc->gssname;
+}
+
+/* takes responsibility for freeing gssname */
+void trpc_set_gssname(TRPC_INSTANCE *trpc, TR_NAME *gssname)
+{
+ trpc->gssname=gssname;
+}
+
unsigned int trpc_get_port(TRPC_INSTANCE *trpc)
{
return trpc->port;
}
-void trpc_set_port(TRPC_INSTANCE *trpc, unsigned int port)
+void trpc_set_port(TRPC_INSTANCE *trpc, int port)
{
trpc->port=port;
}
trpc->conn=conn;
}
-DH *trpc_get_dh(TRPC_INSTANCE *trpc)
-{
- return trpc->dh;
-}
-
-void trpc_set_dh(TRPC_INSTANCE *trpc, DH *dh)
-{
- trpc->dh=dh;
-}
-
TRP_CONNECTION_STATUS trpc_get_status(TRPC_INSTANCE *trpc)
{
return trp_connection_get_status(trpc_get_conn(trpc));
}
/* submit msg to trpc for transmission */
-void trpc_mq_append(TRPC_INSTANCE *trpc, TR_MQ_MSG *msg)
+void trpc_mq_add(TRPC_INSTANCE *trpc, TR_MQ_MSG *msg)
+{
+ tr_mq_add(trpc->mq, msg);
+}
+
+TR_MQ_MSG *trpc_mq_pop(TRPC_INSTANCE *trpc, struct timespec *ts_abort)
{
- tr_mq_append(trpc->mq, msg);
+ return tr_mq_pop(trpc->mq, ts_abort);
}
-TR_MQ_MSG *trpc_mq_pop(TRPC_INSTANCE *trpc)
+void trpc_mq_clear(TRPC_INSTANCE *trpc)
{
- return tr_mq_pop(trpc->mq);
+ tr_mq_clear(trpc->mq);
}
TRP_RC trpc_connect(TRPC_INSTANCE *trpc)
*trp_connection_get_gssctx(trpc_get_conn(trpc)),
msg_content,
strlen(msg_content))) {
- tr_err( "trpc_send_msg: Error sending message over connection.\n");
+ tr_err( "trpc_send_msg: Error sending message over connection.");
rc=TRP_ERROR;
}
return rc;