summaryrefslogtreecommitdiff
path: root/lib/omapi
diff options
context:
space:
mode:
Diffstat (limited to 'lib/omapi')
-rw-r--r--lib/omapi/Makefile.in28
-rw-r--r--lib/omapi/api2
-rw-r--r--lib/omapi/auth.c30
-rw-r--r--lib/omapi/connection.c56
-rw-r--r--lib/omapi/data.c24
-rw-r--r--lib/omapi/generic.c34
-rw-r--r--lib/omapi/handle.c30
-rw-r--r--lib/omapi/include/Makefile.in22
-rw-r--r--lib/omapi/include/omapi/Makefile.in31
-rw-r--r--lib/omapi/include/omapi/compatibility.h24
-rw-r--r--lib/omapi/include/omapi/lib.h22
-rw-r--r--lib/omapi/include/omapi/omapi.h24
-rw-r--r--lib/omapi/include/omapi/private.h31
-rw-r--r--lib/omapi/include/omapi/result.h22
-rw-r--r--lib/omapi/include/omapi/types.h22
-rw-r--r--lib/omapi/lib.c22
-rw-r--r--lib/omapi/listener.c31
-rw-r--r--lib/omapi/message.c40
-rw-r--r--lib/omapi/object.c30
-rw-r--r--lib/omapi/protocol.c38
-rw-r--r--lib/omapi/result.c22
-rw-r--r--lib/omapi/string.c22
-rw-r--r--lib/omapi/value.c33
-rw-r--r--lib/omapi/version.c22
24 files changed, 327 insertions, 335 deletions
diff --git a/lib/omapi/Makefile.in b/lib/omapi/Makefile.in
index 1624af19..b1f14f67 100644
--- a/lib/omapi/Makefile.in
+++ b/lib/omapi/Makefile.in
@@ -1,19 +1,19 @@
# Copyright (C) 1999, 2000 Internet Software Consortium.
-#
+#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-
-# $Id: Makefile.in,v 1.12 2000/06/22 21:59:58 tale Exp $
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+# $Id: Makefile.in,v 1.15 2000/09/20 19:06:13 gson Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -72,9 +72,7 @@ timestamp: libomapi.@A@
touch timestamp
installdirs:
- if [ ! -d ${DESTDIR}${libdir} ]; then \
- mkdir ${DESTDIR}${libdir}; \
- fi
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
install:: timestamp installdirs
${LIBTOOL} ${INSTALL_DATA} libomapi.@A@ ${DESTDIR}${libdir}
diff --git a/lib/omapi/api b/lib/omapi/api
index 91fedd38..e164af24 100644
--- a/lib/omapi/api
+++ b/lib/omapi/api
@@ -1,3 +1,3 @@
-LIBINTERFACE = 1
+LIBINTERFACE = 3
LIBREVISION = 0
LIBAGE = 0
diff --git a/lib/omapi/auth.c b/lib/omapi/auth.c
index a1d949d1..fb58f498 100644
--- a/lib/omapi/auth.c
+++ b/lib/omapi/auth.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: auth.c,v 1.8.2.2 2000/07/12 00:02:12 gson Exp $ */
+/* $Id: auth.c,v 1.14 2000/09/12 09:59:28 bwelling Exp $ */
/* Principal Author: DCL */
@@ -147,8 +147,8 @@ auth_makekey(const char *name, unsigned int algorithm, dst_key_t **key) {
ISC_FALSE, &dstb);
if (result == ISC_R_SUCCESS)
result = dst_key_frombuffer(&dnsname, dst_algorithm,
- 0, 0, &secret,
- omapi_mctx, key);
+ 0, 0, dns_rdataclass_in,
+ &secret, omapi_mctx, key);
}
UNLOCK(&mutex);
@@ -197,7 +197,7 @@ omapi_auth_register(const char *name, unsigned int algorithms,
new->name = isc_mem_strdup(omapi_mctx, name);
if (new->name == NULL)
result = ISC_R_NOMEMORY;
-
+
new->secret = isc_mem_allocate(omapi_mctx, secretlen);
if (new->secret == NULL)
result = ISC_R_NOMEMORY;
@@ -357,5 +357,5 @@ void
auth_destroy(void) {
omapi_auth_deregister(NULL);
- RUNTIME_CHECK(isc_mutex_destroy(&mutex) == ISC_R_SUCCESS);
+ DESTROYLOCK(&mutex);
}
diff --git a/lib/omapi/connection.c b/lib/omapi/connection.c
index ec26ec5f..1cd2b978 100644
--- a/lib/omapi/connection.c
+++ b/lib/omapi/connection.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: connection.c,v 1.31 2000/06/23 21:36:17 tale Exp $ */
+/* $Id: connection.c,v 1.36 2000/11/29 00:10:29 gson Exp $ */
/* Principal Author: DCL */
@@ -101,8 +101,7 @@ free_connection(omapi_connection_t *connection) {
isc_socket_detach(&connection->socket);
if (connection->is_client) {
- RUNTIME_CHECK(isc_mutex_destroy(&connection->wait_lock) ==
- ISC_R_SUCCESS);
+ DESTROYLOCK(&connection->wait_lock);
RUNTIME_CHECK(isc_condition_destroy(&connection->waiter) ==
ISC_R_SUCCESS);
@@ -144,7 +143,7 @@ end_connection(omapi_connection_t *connection) {
/*
* The client connection will be waiting if the error was
* triggered in one of the socket event handlers. It will
- * not be waiting an error happened in omapi_meesgae_send
+ * not be waiting an error happened in omapi_message_send
* or send_intro.
*
* The server connection will never be waiting.
@@ -192,7 +191,7 @@ end_connection(omapi_connection_t *connection) {
* Pause the client until it has received a message from the server, either the
* introductory message or a response to a message it has sent. This is
* necessary because the underlying socket library is multithreaded, and
- * it is possible that reading incoming data would trigger an error
+ * it is possible that reading incoming data would trigger an error
* that causes the connection to be destroyed --- while the client program
* is still trying to use it.
*
@@ -218,7 +217,7 @@ connection_wait(omapi_connection_t *connection_handle) {
INSIST(connection->state == omapi_connection_connecting ||
connection->state == omapi_connection_connected);
-
+
connection->waiting = ISC_TRUE;
while (connection->events_pending > 0)
@@ -314,7 +313,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
unsigned int bytes_read;
UNUSED(task);
-
+
sock = event->ev_sender;
connection = event->ev_arg;
socketevent = (isc_socketevent_t *)event;
@@ -341,10 +340,10 @@ recv_done(isc_task_t *task, isc_event_t *event) {
/*
* Restore the input buffers to the connection object.
*/
- for (buffer = ISC_LIST_HEAD(bufferlist);
- buffer != NULL;
- buffer = ISC_LIST_NEXT(buffer, link))
+ while ((buffer = ISC_LIST_HEAD(bufferlist)) != NULL) {
+ ISC_LIST_UNLINK(bufferlist, buffer, link);
ISC_LIST_APPEND(connection->input_buffers, buffer, link);
+ }
if (result == ISC_R_SUCCESS) {
connection->in_bytes += bytes_read;
@@ -402,7 +401,7 @@ send_done(isc_task_t *task, isc_event_t *event) {
unsigned int sent_bytes;
UNUSED(task);
-
+
sock = event->ev_sender;
connection = event->ev_arg;
socketevent = (isc_socketevent_t *)event;
@@ -439,6 +438,7 @@ send_done(isc_task_t *task, isc_event_t *event) {
* end_connection can free the buffer, if it is called below.
*/
buffer = ISC_LIST_HEAD(bufferlist);
+ ISC_LIST_UNLINK(bufferlist, buffer, link);
ISC_LIST_APPEND(connection->output_buffers, buffer, link);
isc_buffer_clear(buffer);
@@ -491,7 +491,7 @@ connection_send(omapi_connection_t *connection) {
*/
if (connection->is_client)
LOCK(&connection->wait_lock);
-
+
isc_socket_sendv(connection->socket, &connection->output_buffers,
connection->task, send_done, connection);
@@ -549,7 +549,7 @@ connect_toserver(omapi_object_t *protocol, const char *server_name,
sizeof(*connection));
if (result != ISC_R_SUCCESS)
goto free_obuffer;
-
+
connection->is_client = ISC_TRUE;
connection->waiting = ISC_FALSE;
connection->state = omapi_connection_connecting;
@@ -714,7 +714,7 @@ connection_copyout(unsigned char *dst, omapi_connection_t *connection,
REQUIRE(protocol != NULL && protocol->type == omapi_type_protocol);
INSIST(size <= connection->in_bytes);
-
+
connection->bytes_needed -= size;
buffer = ISC_LIST_HEAD(connection->input_buffers);
@@ -946,7 +946,7 @@ omapi_connection_putuint32(omapi_object_t *c, isc_uint32_t value) {
isc_uint32_t inbuf;
inbuf = htonl(value);
-
+
return (omapi_connection_putmem(c, (unsigned char *)&inbuf,
sizeof(inbuf)));
}
@@ -958,7 +958,7 @@ omapi_connection_putuint16(omapi_object_t *c, isc_uint32_t value) {
REQUIRE(value < 65536);
inbuf = htons((isc_uint16_t)value);
-
+
return (omapi_connection_putmem(c, (unsigned char *)&inbuf,
sizeof(inbuf)));
}
@@ -1073,7 +1073,7 @@ connection_setvalue(omapi_object_t *connection, omapi_string_t *name,
{
REQUIRE(connection != NULL &&
connection->type == omapi_type_connection);
-
+
return (omapi_object_passsetvalue(connection, name, value));
}
@@ -1124,7 +1124,7 @@ connection_signalhandler(omapi_object_t *connection, const char *name,
{
REQUIRE(connection != NULL &&
connection->type == omapi_type_connection);
-
+
return (omapi_object_passsignal(connection, name, ap));
}
diff --git a/lib/omapi/data.c b/lib/omapi/data.c
index 4813b85e..f6c697e0 100644
--- a/lib/omapi/data.c
+++ b/lib/omapi/data.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: data.c,v 1.15 2000/06/23 20:04:25 tale Exp $ */
+/* $Id: data.c,v 1.18 2000/10/11 21:19:00 marka Exp $ */
/* Principal Author: Ted Lemon */
@@ -204,7 +204,7 @@ omapi_data_strdup(isc_mem_t *mctx, omapi_data_t *t) {
REQUIRE(t->type == omapi_datatype_string ||
t->type == omapi_datatype_data);
- s = isc_mem_get(mctx, t->u.buffer.len + 1);
+ s = isc_mem_allocate(mctx, t->u.buffer.len + 1);
if (s != NULL) {
memcpy(s, t->u.buffer.value, t->u.buffer.len);
s[t->u.buffer.len] = '\0';
diff --git a/lib/omapi/generic.c b/lib/omapi/generic.c
index ad6a2273..b60e3498 100644
--- a/lib/omapi/generic.c
+++ b/lib/omapi/generic.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: generic.c,v 1.15 2000/06/21 22:01:17 tale Exp $ */
+/* $Id: generic.c,v 1.17 2000/08/01 01:32:51 tale Exp $ */
/* Principal Author: Ted Lemon */
@@ -84,7 +84,7 @@ generic_setvalue(omapi_object_t *h, omapi_string_t *name, omapi_data_t *value)
return (ISC_R_SUCCESS);
}
- }
+ }
/*
* If the name isn't already attached to this object, see if an
@@ -146,7 +146,7 @@ generic_getvalue(omapi_object_t *h, omapi_string_t *name,
REQUIRE(h != NULL && h->type == omapi_type_generic);
g = (omapi_generic_t *)h;
-
+
/*
* Look up the specified name in our list of objects.
*/
@@ -165,7 +165,7 @@ generic_getvalue(omapi_object_t *h, omapi_string_t *name,
omapi_value_reference(value, g->values[i]);
return (ISC_R_SUCCESS);
}
- }
+ }
return (omapi_object_passgetvalue(h, name, value));
}
@@ -178,7 +178,7 @@ generic_destroy(omapi_object_t *h) {
REQUIRE(h != NULL && h->type == omapi_type_generic);
g = (omapi_generic_t *)h;
-
+
if (g->values != NULL) {
for (i = 0; i < g->nvalues; i++)
if (g->values[i] != NULL)
@@ -220,7 +220,7 @@ generic_stuffvalues(omapi_object_t *connection, omapi_object_t *h) {
REQUIRE(h != NULL && h->type == omapi_type_generic);
src = (omapi_generic_t *)h;
-
+
for (i = 0; i < src->nvalues; i++) {
if (src->values[i] != NULL &&
src->values[i]->name->len != 0) {
@@ -239,7 +239,7 @@ generic_stuffvalues(omapi_object_t *connection, omapi_object_t *h) {
if (result != ISC_R_SUCCESS)
return (result);
}
- }
+ }
return (omapi_object_passstuffvalues(connection, h));
}
diff --git a/lib/omapi/handle.c b/lib/omapi/handle.c
index 1a0db142..d17ebd38 100644
--- a/lib/omapi/handle.c
+++ b/lib/omapi/handle.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: handle.c,v 1.14 2000/06/23 20:05:00 tale Exp $ */
+/* $Id: handle.c,v 1.17 2000/08/26 01:42:33 bwelling Exp $ */
/* Principal Author: Ted Lemon */
@@ -50,7 +50,7 @@
* next handle should go, and if necessary create additional nodes in
* the tree to contain the new handle. The pointer to the object is
* then stored in the correct position.
- *
+ *
* XXXTL
* Theoretically, we could have some code here to free up handle
* tables as they go out of use, but by and large handle tables won't
@@ -138,7 +138,7 @@ handle_store(omapi_handle_t h, omapi_handletable_t *table, omapi_object_t *o) {
if (table->first > h || table->limit <= h)
return (ISC_R_NOSPACE);
-
+
/*
* If this is a leaf table, just stash the object in the
* appropriate place.
@@ -228,7 +228,7 @@ object_gethandle(omapi_handle_t *h, omapi_object_t *o) {
*/
while (next_handle >= toptable->limit) {
omapi_handletable_t *new;
-
+
new = isc_mem_get(omapi_mctx, sizeof(*new));
if (new != NULL) {
memset(new, 0, sizeof(*new));
@@ -348,5 +348,5 @@ handle_destroy(void) {
UNLOCK(&mutex);
- RUNTIME_CHECK(isc_mutex_destroy(&mutex) == ISC_R_SUCCESS);
+ DESTROYLOCK(&mutex);
}
diff --git a/lib/omapi/include/Makefile.in b/lib/omapi/include/Makefile.in
index ba7f901d..fa5707e0 100644
--- a/lib/omapi/include/Makefile.in
+++ b/lib/omapi/include/Makefile.in
@@ -1,19 +1,19 @@
# Copyright (C) 1999, 2000 Internet Software Consortium.
-#
+#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.3 2000/06/22 22:00:06 tale Exp $
+# $Id: Makefile.in,v 1.5 2000/08/01 01:33:04 tale Exp $
srcdir = @srcdir@
VPATH = @srcdir@
diff --git a/lib/omapi/include/omapi/Makefile.in b/lib/omapi/include/omapi/Makefile.in
index 18f477d7..97e6aa43 100644
--- a/lib/omapi/include/omapi/Makefile.in
+++ b/lib/omapi/include/omapi/Makefile.in
@@ -1,19 +1,19 @@
# Copyright (C) 1999, 2000 Internet Software Consortium.
-#
+#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-
-# $Id: Makefile.in,v 1.7 2000/06/22 22:00:08 tale Exp $
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+# $Id: Makefile.in,v 1.10 2000/09/20 19:06:14 gson Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -29,12 +29,7 @@ TARGETS =
@BIND9_MAKE_RULES@
installdirs:
- if [ ! -d ${DESTDIR}${includedir} ]; then \
- mkdir ${DESTDIR}${includedir} ; \
- fi
- if [ ! -d ${DESTDIR}${includedir}/omapi ]; then \
- mkdir ${DESTDIR}${includedir}/omapi ; \
- fi
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/omapi
install:: installdirs
for i in ${HEADERS}; do \
diff --git a/lib/omapi/include/omapi/compatibility.h b/lib/omapi/include/omapi/compatibility.h
index 037515d6..b3ae23cf 100644
--- a/lib/omapi/include/omapi/compatibility.h
+++ b/lib/omapi/include/omapi/compatibility.h
@@ -1,21 +1,21 @@
/*
* Copyright (C) 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: compatibility.h,v 1.4 2000/06/22 22:00:09 tale Exp $ */
+/* $Id: compatibility.h,v 1.6 2000/08/01 01:33:07 tale Exp $ */
#ifndef OMAPI_COMPATIBILITY_H
#define OMAPI_COMPATIBILITY_H 1
@@ -56,7 +56,7 @@
* The get_value, set_value and stuff_values methods all had their id
* parameter removed, so those functions for special client/server objects
* need to have their definitions adjusted.
- *
+ *
*/
#define omapi_set_value(h, id, name, value) \
omapi_object_set(h, name, value)
diff --git a/lib/omapi/include/omapi/lib.h b/lib/omapi/include/omapi/lib.h
index 8f852f39..44b03eb5 100644
--- a/lib/omapi/include/omapi/lib.h
+++ b/lib/omapi/include/omapi/lib.h
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1999, 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: lib.h,v 1.3 2000/06/22 22:00:11 tale Exp $ */
+/* $Id: lib.h,v 1.5 2000/08/01 01:33:08 tale Exp $ */
#ifndef OMAPI_LIB_H
#define OMAPI_LIB_H 1
diff --git a/lib/omapi/include/omapi/omapi.h b/lib/omapi/include/omapi/omapi.h
index 693ddd7e..282c6fe1 100644
--- a/lib/omapi/include/omapi/omapi.h
+++ b/lib/omapi/include/omapi/omapi.h
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: omapi.h,v 1.13.2.2 2000/07/12 00:02:14 gson Exp $ */
+/* $Id: omapi.h,v 1.17 2000/08/01 01:33:09 tale Exp $ */
/*
* Definitions for the object management API and protocol.
@@ -264,7 +264,7 @@ omapi_object_setstring(omapi_object_t *handle, const char *name,
isc_result_t
omapi_object_getvalue(omapi_object_t *handle, const char *name,
- omapi_value_t **value);
+ omapi_value_t **value);
isc_result_t
omapi_object_passgetvalue(omapi_object_t *object, omapi_string_t *name,
diff --git a/lib/omapi/include/omapi/private.h b/lib/omapi/include/omapi/private.h
index e33e4f80..10dcc58d 100644
--- a/lib/omapi/include/omapi/private.h
+++ b/lib/omapi/include/omapi/private.h
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: private.h,v 1.21.2.1 2000/07/11 17:23:24 gson Exp $ */
+/* $Id: private.h,v 1.25 2000/08/26 01:56:46 bwelling Exp $ */
/*****
***** Private master include file for the OMAPI library.
@@ -26,6 +26,7 @@
#include <isc/condition.h>
#include <isc/lang.h>
+#include <isc/mutex.h>
#include <isc/socket.h>
#include <dst/dst.h>
@@ -166,7 +167,7 @@ struct omapi_connection {
/*
* The error that caused the connection to be freed.
*/
- isc_result_t result;
+ isc_result_t result;
/*
* Number of socket events outstanding. This should always be
* either 0 or 1 under the current model; having any more than
@@ -222,7 +223,7 @@ struct omapi_connection {
struct omapi_protocol {
OMAPI_OBJECT_PREAMBLE;
- isc_uint32_t header_size;
+ isc_uint32_t header_size;
isc_uint32_t protocol_version;
isc_uint32_t next_xid;
omapi_object_t * authinfo; /* Default authinfo. */
@@ -264,7 +265,7 @@ extern omapi_objecttype_t *omapi_type_message;
extern omapi_objecttype_t *omapi_object_types;
/*
- * Everything needs a memory context.
+ * Everything needs a memory context.
*/
extern isc_mem_t *omapi_mctx;
@@ -318,7 +319,7 @@ connection_init(void);
#define connect_toserver omapi__connect_toserver
isc_result_t
-connect_toserver(omapi_object_t *connection, const char *server,
+connect_toserver(omapi_object_t *connection, const char *server,
in_port_t port);
#define connection_send omapi__connection_send
diff --git a/lib/omapi/include/omapi/result.h b/lib/omapi/include/omapi/result.h
index be256b5b..be70e574 100644
--- a/lib/omapi/include/omapi/result.h
+++ b/lib/omapi/include/omapi/result.h
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1999, 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: result.h,v 1.5 2000/06/22 22:00:16 tale Exp $ */
+/* $Id: result.h,v 1.7 2000/08/01 01:33:11 tale Exp $ */
#ifndef OMAPI_RESULT_H
#define OMAPI_RESULT_H 1
diff --git a/lib/omapi/include/omapi/types.h b/lib/omapi/include/omapi/types.h
index 22c75566..6a9dafa3 100644
--- a/lib/omapi/include/omapi/types.h
+++ b/lib/omapi/include/omapi/types.h
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: types.h,v 1.5 2000/06/22 22:00:17 tale Exp $ */
+/* $Id: types.h,v 1.7 2000/08/01 01:33:12 tale Exp $ */
#ifndef OMAPI_TYPES_H
#define OMAPI_TYPES_H 1
diff --git a/lib/omapi/lib.c b/lib/omapi/lib.c
index ba459210..c036cbc3 100644
--- a/lib/omapi/lib.c
+++ b/lib/omapi/lib.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1999, 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: lib.c,v 1.11 2000/05/14 03:51:07 tale Exp $ */
+/* $Id: lib.c,v 1.13 2000/08/01 01:32:54 tale Exp $ */
#include <config.h>
diff --git a/lib/omapi/listener.c b/lib/omapi/listener.c
index 185f7c27..daf6fd7d 100644
--- a/lib/omapi/listener.c
+++ b/lib/omapi/listener.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: listener.c,v 1.26.2.1 2000/07/11 17:23:20 gson Exp $ */
+/* $Id: listener.c,v 1.31 2000/10/20 13:29:37 marka Exp $ */
/*
* Subroutines that support the generic listener object.
@@ -149,7 +149,7 @@ listener_accept(isc_task_t *task, isc_event_t *event) {
*/
if (result != ISC_R_SUCCESS)
return;
-
+
/*
* Is the connection from a valid host?
*/
@@ -200,6 +200,7 @@ listener_accept(isc_task_t *task, isc_event_t *event) {
ISC_LIST_APPEND(connection->input_buffers, ibuffer, link);
ISC_LIST_INIT(connection->output_buffers);
ISC_LIST_APPEND(connection->output_buffers, obuffer, link);
+ ISC_LINK_INIT(connection, link);
/*
* Create a new protocol object to oversee the handling of this
@@ -361,7 +362,7 @@ omapi_listener_listen(omapi_object_t *manager, isc_sockaddr_t *addr,
} else {
/*
- * Failed to set up the listener.
+ * Failed to set up the listener.
*/
listener->listening = ISC_FALSE;
OBJECT_DEREF(&listener);
@@ -417,7 +418,7 @@ listener_getvalue(omapi_object_t *listener, omapi_string_t *name,
* continue the call through the object chain.
*/
REQUIRE(listener != NULL && listener->type == omapi_type_listener);
-
+
return (omapi_object_passgetvalue(listener, name, value));
}
@@ -433,7 +434,7 @@ listener_destroy(omapi_object_t *listener) {
INSIST(ISC_LIST_EMPTY(l->connections));
UNLOCK(&l->mutex);
- RUNTIME_CHECK(isc_mutex_destroy(&l->mutex) == ISC_R_SUCCESS);
+ DESTROYLOCK(&l->mutex);
if (l->task != NULL)
isc_task_destroy(&l->task);
diff --git a/lib/omapi/message.c b/lib/omapi/message.c
index 1d09461a..7d455a43 100644
--- a/lib/omapi/message.c
+++ b/lib/omapi/message.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: message.c,v 1.25.2.1 2000/06/28 05:27:02 tale Exp $ */
+/* $Id: message.c,v 1.28 2000/08/01 01:32:56 tale Exp $ */
/*
* Subroutines for dealing with message objects.
@@ -72,7 +72,7 @@ omapi_message_register(omapi_object_t *h) {
REQUIRE(h != NULL && h->type == omapi_type_message);
m = (omapi_message_t *)h;
-
+
/*
* Already registered?
*/
@@ -96,7 +96,7 @@ omapi_message_unregister(omapi_object_t *h) {
REQUIRE(h != NULL && h->type == omapi_type_message);
m = (omapi_message_t *)h;
-
+
/*
* Not registered?
*/
@@ -276,7 +276,7 @@ omapi_message_send(omapi_object_t *message, omapi_object_t *protocol) {
c->bytes_needed = p->header_size;
result = connection_send(c);
-
+
/*
* The client waited for the result; the server did not.
* The server's result will always be ISC_R_SUCCESS.
@@ -499,7 +499,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
isc_result_totext(result)));
/*
- * All messages except for the first attempt to set
+ * All messages except for the first attempt to set
* the dst key used by the protocol must be signed.
*/
#ifdef notyet /* not for 9.0.0 */
@@ -531,7 +531,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
* under the current design of OMAPI, there just isn't
* a good way to set the authentication values. The
* connection object and protocol object are the only
- * things that hold state on the server throughout the life
+ * things that hold state on the server throughout the life
* of a particular connection, and the original design
* for lookup methods does not provide a way to identify
* the current protocol or connection object.
@@ -566,7 +566,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
if (result == ISC_R_NOTFOUND && create == 0) {
return (send_status(po, ISC_R_NOTFOUND, message->id,
"no object matches specification"));
- }
+ }
/*
* If we found an object, we're supposed to be creating an
@@ -601,7 +601,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
"can't update object"));
}
}
-
+
/*
* Now send the new contents of the object back in response.
*/
@@ -623,7 +623,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
return (send_status(po, result, message->id,
"no matching handle"));
- send:
+ send:
result = send_update(po, message->id, object);
OBJECT_DEREF(&object);
return (result);
@@ -905,7 +905,7 @@ message_signalhandler(omapi_object_t *handle, const char *name, va_list ap) {
REQUIRE(handle != NULL && handle->type == omapi_type_message);
message = (omapi_message_t *)handle;
-
+
/*
* XXXDCL It would make the client side a bit cleaner if when "status"
* is signalled, it sets both "waitresult" and "waittext" (or some
diff --git a/lib/omapi/object.c b/lib/omapi/object.c
index f5abdd7f..9cd6080f 100644
--- a/lib/omapi/object.c
+++ b/lib/omapi/object.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: object.c,v 1.19 2000/06/23 21:05:20 tale Exp $ */
+/* $Id: object.c,v 1.22 2000/08/01 01:32:57 tale Exp $ */
/* Principal Author: Ted Lemon */
@@ -32,7 +32,7 @@
struct omapi_objecttype {
const char * name;
omapi_objecttype_t * next;
-
+
isc_result_t (*set_value)(omapi_object_t *object,
omapi_string_t *name,
omapi_data_t *value);
@@ -206,7 +206,7 @@ omapi_object_dereference(omapi_object_t **h) {
if (action != NULL) {
isc_event_t *event;
- event = isc_event_allocate(omapi_mctx, *h,
+ event = isc_event_allocate(omapi_mctx, NULL,
OMAPI_EVENT_OBJECTFREED,
action, arg,
sizeof(isc_event_t));
@@ -216,7 +216,7 @@ omapi_object_dereference(omapi_object_t **h) {
} else
(*h)->refcnt--;
-
+
} else
(*h)->refcnt--;
@@ -460,7 +460,7 @@ omapi_object_setstring(omapi_object_t *h, const char *name, const char *value)
}
isc_result_t
-omapi_object_getvalue(omapi_object_t *h, const char *name,
+omapi_object_getvalue(omapi_object_t *h, const char *name,
omapi_value_t **value)
{
omapi_object_t *outer;
diff --git a/lib/omapi/protocol.c b/lib/omapi/protocol.c
index d2e72519..b0b5700f 100644
--- a/lib/omapi/protocol.c
+++ b/lib/omapi/protocol.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: protocol.c,v 1.28.2.1 2000/07/11 17:23:21 gson Exp $ */
+/* $Id: protocol.c,v 1.32 2000/10/11 21:19:01 marka Exp $ */
/*
* Functions supporting the object management protocol.
@@ -273,8 +273,8 @@ send_update(omapi_object_t *po, unsigned int rid, omapi_object_t *object) {
if (result == ISC_R_SUCCESS)
result = omapi_object_setinteger(message, "handle",
(int)handle);
- }
-
+ }
+
if (result == ISC_R_SUCCESS)
result = omapi_object_setobject(message, "object", object);
@@ -312,7 +312,7 @@ dispatch_messages(omapi_protocol_t *protocol,
*/
connection_getuint32(connection, &protocol->protocol_version);
connection_getuint32(connection, &protocol->header_size);
-
+
/*
* Currently only the current protocol version is supported.
*/
@@ -566,7 +566,8 @@ dispatch_messages(omapi_protocol_t *protocol,
break;
omapi_string_dereference(&protocol->name);
- omapi_data_dereference(&protocol->value);
+ if (protocol->value != NULL)
+ omapi_data_dereference(&protocol->value);
goto need_name_length;
@@ -746,8 +747,7 @@ protocol_setvalue(omapi_object_t *h, omapi_string_t *name, omapi_data_t *value)
if (result != ISC_R_SUCCESS) {
if (p->key != NULL)
dst_key_free(&p->key);
- isc_mem_put(omapi_mctx, p->authname,
- strlen(p->authname) + 1);
+ isc_mem_free(omapi_mctx, p->authname);
p->authname = NULL;
p->algorithm = 0;
p->key = NULL;
@@ -762,7 +762,7 @@ protocol_getvalue(omapi_object_t *h, omapi_string_t *name,
omapi_value_t **value)
{
REQUIRE(h != NULL && h->type == omapi_type_protocol);
-
+
return (omapi_object_passgetvalue(h, name, value));
}
@@ -781,7 +781,7 @@ protocol_destroy(omapi_object_t *h) {
OBJECT_DEREF(&p->authinfo);
if (p->authname != NULL) {
- isc_mem_put(omapi_mctx, p->authname, strlen(p->authname) + 1);
+ isc_mem_free(omapi_mctx, p->authname);
p->authname = NULL;
}
diff --git a/lib/omapi/result.c b/lib/omapi/result.c
index 36589085..081dff98 100644
--- a/lib/omapi/result.c
+++ b/lib/omapi/result.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1999, 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: result.c,v 1.8 2000/06/01 17:33:37 tale Exp $ */
+/* $Id: result.c,v 1.10 2000/08/01 01:33:00 tale Exp $ */
#include <config.h>
#include <isc/once.h>
diff --git a/lib/omapi/string.c b/lib/omapi/string.c
index d2177206..8f9bda83 100644
--- a/lib/omapi/string.c
+++ b/lib/omapi/string.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: string.c,v 1.7 2000/06/21 22:01:25 tale Exp $ */
+/* $Id: string.c,v 1.9 2000/08/01 01:33:01 tale Exp $ */
/* Principal Author: Ted Lemon */
diff --git a/lib/omapi/value.c b/lib/omapi/value.c
index 0d82a921..bd2d65b2 100644
--- a/lib/omapi/value.c
+++ b/lib/omapi/value.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1996-2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: value.c,v 1.7 2000/06/21 22:01:26 tale Exp $ */
+/* $Id: value.c,v 1.10 2000/09/16 03:20:54 tale Exp $ */
/* Principal Author: Ted Lemon */
@@ -110,8 +110,7 @@ omapi_value_storemem(omapi_value_t **vp, omapi_string_t *name,
}
isc_result_t
-omapi_value_storeint(omapi_value_t **vp, omapi_string_t *name, int value)
-{
+omapi_value_storeint(omapi_value_t **vp, omapi_string_t *name, int value) {
isc_result_t result;
result = omapi_value_create(vp);
@@ -120,12 +119,10 @@ omapi_value_storeint(omapi_value_t **vp, omapi_string_t *name, int value)
omapi_string_reference(&(*vp)->name, name);
- if (value != 0) {
- result = omapi_data_create(&(*vp)->value, omapi_datatype_int);
+ result = omapi_data_create(&(*vp)->value, omapi_datatype_int);
- if (result == ISC_R_SUCCESS)
- (*vp)->value->u.integer = value;
- }
+ if (result == ISC_R_SUCCESS)
+ (*vp)->value->u.integer = value;
if (result != ISC_R_SUCCESS)
omapi_value_dereference(vp);
diff --git a/lib/omapi/version.c b/lib/omapi/version.c
index 2814327b..cbbcd414 100644
--- a/lib/omapi/version.c
+++ b/lib/omapi/version.c
@@ -1,21 +1,21 @@
/*
* Copyright (C) 1999, 2000 Internet Software Consortium.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: version.c,v 1.3 2000/06/22 22:00:04 tale Exp $ */
+/* $Id: version.c,v 1.5 2000/08/01 01:33:03 tale Exp $ */
char omapi_version[] = VERSION;
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-19 02:11:35 +0000