From: Michael Graff Date: Mon, 13 Nov 2006 20:07:57 +0000 (+0000) Subject: update to mainline's bind9, and make a new branch for it. X-Git-Tag: v9.5.0a1~83 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ea964e3e20775498e3c64b4e54f4ceb6ee00f53a;p=thirdparty%2Fbind9.git update to mainline's bind9, and make a new branch for it. --- diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl new file mode 100644 index 00000000000..8e6a8769f74 --- /dev/null +++ b/bin/named/bind9.xsl @@ -0,0 +1,142 @@ + + + + + + + BIND 9 Statistics + + +
Bind 9 Configuration and Statistics Report
+ +
+ + + + + + + + + + + + + + + +
Zone Configuration Parameters
+ Maximum transfers in: + + + + +
+ Transfers per name server: + + + + +
+ Serial query rate: + + + + +
+ I/O limit: + + + + +
+ +
+ + + + + + +
Current Zone Statistics
+ Transfers Active: + + + + +
+ +
+ + + + + + + + + + +
Zone List
NameSerial
+ + + + diff --git a/bin/named/convertxsl.pl b/bin/named/convertxsl.pl new file mode 100755 index 00000000000..004b4a581ec --- /dev/null +++ b/bin/named/convertxsl.pl @@ -0,0 +1,20 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +print 'char *msg = "'; + +my $lines = ''; + +while (<>) { + chomp; + $lines .= $_; +} + +$lines =~ s/[\ \t]+/ /g; +$lines =~ s/\>\ \\ +#include +#include +#include +#include +#include +#include + +#include + +/*% + * TODO: + * + * o Put in better checks to make certain things are passed in correctly. + * This includes a magic number for externally-visable structures, + * checking for NULL-ness before dereferencing, etc. + * o Make the URL processing external functions which will fill-in a buffer + * structure we provide, or return an error and we will render a generic + * page and close the client. + */ + +#define MSHUTTINGDOWN(cm) ((cm->flags & ISC_HTTPDMGR_FLAGSHUTTINGDOWN) != 0) +#define MSETSHUTTINGDOWN(cm) (cm->flags |= ISC_HTTPDMGR_FLAGSHUTTINGDOWN) + +#ifdef DEBUG_HTTPD +#define ENTER(x) do { fprintf(stderr, "ENTER %s\n", (x)); } while (0) +#define EXIT(x) do { fprintf(stderr, "EXIT %s\n", (x)); } while (0) +#define NOTICE(x) do { fprintf(stderr, "NOTICE %s\n", (x)); } while (0) +#else +#define ENTER(x) do { } while(0) +#define EXIT(x) do { } while(0) +#define NOTICE(x) do { } while(0) +#endif + +#define HTTP_RECVLEN 1024 +#define HTTP_SENDGROW 1024 +#define HTTP_SEND_MAXLEN 10240 + +/*% + * HTTP urls. These are the URLs we manage, and the function to call to + * provide the data for it. We pass in the base url (so the same function + * can handle multiple requests), and a structure to fill in to return a + * result to the client. We also pass in a pointer to be filled in for + * the data cleanup function. + */ +struct isc_httpdurl { + char *url; + isc_httpdaction_t *action; + void *action_arg; + ISC_LINK(isc_httpdurl_t) link; +}; + +#define HTTPD_CLOSE 0x0001 /* Got a Connection: close header */ +#define HTTPD_FOUNDHOST 0x0002 /* Got a Host: header */ + +/*% http client */ +struct isc_httpd { + isc_httpdmgr_t *mgr; /*%< our parent */ + ISC_LINK(isc_httpd_t) link; + unsigned int state; + isc_socket_t *sock; + + /*% + * Received data state. + */ + char recvbuf[HTTP_RECVLEN]; /*%< receive buffer */ + isc_uint32_t recvlen; /*%< length recv'd */ + unsigned int method; + char *url; + char *querystring; + char *protocol; + + /* + * Flags on the httpd client. + */ + int flags; + + /*% + * Transmit data state. + * + * This is the data buffer we will transmit. + * + * This free function pointer is filled in by the rendering function + * we call. The free function is called after the data is transmitted + * to the client. + * + * The bufflist is the list of buffers we are currently transmitting. + * The headerdata is where we render our headers to. If we run out of + * space when rendering a header, we will change the size of our + * buffer. We will not free it until we are finished, and will + * allocate an additional HTTP_SENDGROW bytes per header space grow. + * + * We currently use two buffers total, one for the headers (which + * we manage) and another for the client to fill in (which it manages, + * it provides the space for it, etc) -- we will pass that buffer + * structure back to the caller, who is responsible for managing the + * space it may have allocated as backing store for it. This second + * buffer is bodybuffer, and we only allocate the buffer itself, not + * the backing store. + */ + isc_bufferlist_t bufflist; + char *headerdata; /*%< send header buf */ + unsigned int headerlen; /*%< current header buffer size */ + isc_buffer_t headerbuffer; + + const char *mimetype; + unsigned int retcode; + const char *retmsg; + isc_buffer_t bodybuffer; + isc_httpdfree_t *freecb; + void *freecb_arg; +}; + +/*% lightweight socket manager for httpd output */ +struct isc_httpdmgr { + isc_mem_t *mctx; + isc_socket_t *sock; /*%< listening socket */ + isc_task_t *task; /*%< owning task */ + isc_timermgr_t *timermgr; + + unsigned int flags; + ISC_LIST(isc_httpd_t) running; /*%< running clients */ + + isc_mutex_t lock; + + ISC_LIST(isc_httpdurl_t) urls; /*%< urls we manage */ + isc_httpdaction_t *render_404; +}; + +/*% + * HTTP methods. + */ +#define ISC_HTTPD_METHODUNKNOWN 0 +#define ISC_HTTPD_METHODGET 1 +#define ISC_HTTPD_METHODPOST 2 + +/*% + * Client states. + * + * _IDLE The client is not doing anything at all. This state should + * only occur just after creation, and just before being + * destroyed. + * + * _RECV The client is waiting for data after issuing a socket recv(). + * + * _RECVDONE Data has been received, and is being processed. + * + * _SEND All data for a response has completed, and a reply was + * sent via a socket send() call. + * + * _SENDDONE Send is completed. + * + * Badly formatted state table: + * + * IDLE -> RECV when client has a recv() queued. + * + * RECV -> RECVDONE when recvdone event received. + * + * RECVDONE -> SEND if the data for a reply is at hand. + * + * SEND -> RECV when a senddone event was received. + * + * At any time -> RECV on error. If RECV fails, the client will + * self-destroy, closing the socket and freeing memory. + */ +#define ISC_HTTPD_STATEIDLE 0 +#define ISC_HTTPD_STATERECV 1 +#define ISC_HTTPD_STATERECVDONE 2 +#define ISC_HTTPD_STATESEND 3 +#define ISC_HTTPD_STATESENDDONE 4 + +#define ISC_HTTPD_ISRECV(c) ((c)->state == ISC_HTTPD_STATERECV) +#define ISC_HTTPD_ISRECVDONE(c) ((c)->state == ISC_HTTPD_STATERECVDONE) +#define ISC_HTTPD_ISSEND(c) ((c)->state == ISC_HTTPD_STATESEND) +#define ISC_HTTPD_ISSENDDONE(c) ((c)->state == ISC_HTTPD_STATESENDDONE) + +/*% + * Overall magic test that means we're not idle. + */ +#define ISC_HTTPD_SETRECV(c) ((c)->state = ISC_HTTPD_STATERECV) +#define ISC_HTTPD_SETRECVDONE(c) ((c)->state = ISC_HTTPD_STATERECVDONE) +#define ISC_HTTPD_SETSEND(c) ((c)->state = ISC_HTTPD_STATESEND) +#define ISC_HTTPD_SETSENDDONE(c) ((c)->state = ISC_HTTPD_STATESENDDONE) + +static void isc_httpd_accept(isc_task_t *, isc_event_t *); +static void isc_httpd_recvdone(isc_task_t *, isc_event_t *); +static void isc_httpd_senddone(isc_task_t *, isc_event_t *); +static void destroy_client(isc_httpd_t **); +static isc_result_t process_request(isc_httpd_t *, int); +static void httpdmgr_destroy(isc_httpdmgr_t *); +static isc_result_t grow_headerspace(isc_httpd_t *); +static void reset_client(isc_httpd_t *httpd); +static isc_result_t render_404(const char *, const char *, + void *, + unsigned int *, const char **, + const char **, isc_buffer_t *, + isc_httpdfree_t **, void **); + +static void +destroy_client(isc_httpd_t **httpdp) +{ + isc_httpd_t *httpd = *httpdp; + *httpdp = NULL; + isc_httpdmgr_t *httpdmgr = httpd->mgr; + + LOCK(&httpdmgr->lock); + + isc_socket_detach(&httpd->sock); + ISC_LIST_UNLINK(httpdmgr->running, httpd, link); + + if (httpd->headerlen > 0) + isc_mem_put(httpdmgr->mctx, httpd->headerdata, + httpd->headerlen); + + isc_mem_put(httpdmgr->mctx, httpd, sizeof(isc_httpd_t)); + + UNLOCK(&httpdmgr->lock); + + httpdmgr_destroy(httpdmgr); +} + +isc_result_t +isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task, + isc_timermgr_t *tmgr, isc_httpdmgr_t **httpdp) +{ + isc_result_t result; + isc_httpdmgr_t *httpd; + + REQUIRE(mctx != NULL); + REQUIRE(sock != NULL); + REQUIRE(task != NULL); + REQUIRE(tmgr != NULL); + REQUIRE(httpdp != NULL && *httpdp == NULL); + + httpd = isc_mem_get(mctx, sizeof(isc_httpdmgr_t)); + if (httpd == NULL) + return (ISC_R_NOMEMORY); + + isc_mutex_init(&httpd->lock); + httpd->mctx = NULL; + isc_mem_attach(mctx, &httpd->mctx); + httpd->sock = NULL; + isc_socket_attach(sock, &httpd->sock); + httpd->task = NULL; + isc_task_attach(task, &httpd->task); + httpd->timermgr = tmgr; /* XXHTTPG no attach function? */ + + ISC_LIST_INIT(httpd->running); + ISC_LIST_INIT(httpd->urls); + + /* XXHTTPG ignore errors on isc_socket_listen() */ + (void)isc_socket_listen(sock, SOMAXCONN); + + result = isc_socket_accept(sock, task, isc_httpd_accept, httpd); + if (result != ISC_R_SUCCESS) { + isc_mem_put(mctx, httpd, sizeof(isc_httpdmgr_t)); + return (result); + } + + httpd->render_404 = render_404; + + *httpdp = httpd; + return (ISC_R_SUCCESS); +} + +static void +httpdmgr_destroy(isc_httpdmgr_t *httpdmgr) +{ + isc_mem_t *mctx; + isc_httpdurl_t *url; + + ENTER("httpdmgr_destroy"); + + LOCK(&httpdmgr->lock); + + if (!MSHUTTINGDOWN(httpdmgr)) { + NOTICE("httpdmgr_destroy not shutting down yet"); + UNLOCK(&httpdmgr->lock); + return; + } + + /* + * If all clients are not shut down, don't do anything yet. + */ + if (!ISC_LIST_EMPTY(httpdmgr->running)) { + NOTICE("httpdmgr_destroy clients still active"); + UNLOCK(&httpdmgr->lock); + return; + } + + NOTICE("httpdmgr_destroy detaching socket, task, and timermgr"); + + isc_socket_detach(&httpdmgr->sock); + isc_task_detach(&httpdmgr->task); + httpdmgr->timermgr = NULL; + + /* + * Clear out the list of all actions we know about. Just free the + * memory. + */ + url = ISC_LIST_HEAD(httpdmgr->urls); + while (url != NULL) { + isc_mem_free(httpdmgr->mctx, url->url); + ISC_LIST_UNLINK(httpdmgr->urls, url, link); + isc_mem_put(httpdmgr->mctx, url, sizeof(isc_httpdurl_t)); + url = ISC_LIST_HEAD(httpdmgr->urls); + } + + UNLOCK(&httpdmgr->lock); + isc_mutex_destroy(&httpdmgr->lock); + + mctx = httpdmgr->mctx; + isc_mem_put(mctx, httpdmgr, sizeof(isc_httpdmgr_t)); + isc_mem_detach(&mctx); + + EXIT("httpdmgr_destroy"); +} + +#define LENGTHOK(s) (httpd->recvbuf - (s) < (int)httpd->recvlen) +#define BUFLENOK(s) (httpd->recvbuf - (s) < HTTP_RECVLEN) + +static isc_result_t +process_request(isc_httpd_t *httpd, int length) +{ + char *s; + char *p; + int delim; + + ENTER("request"); + + httpd->recvlen += length; + + httpd->recvbuf[httpd->recvlen] = 0; + + /* + * If we don't find a blank line in our buffer, return that we need + * more data. + */ + s = strstr(httpd->recvbuf, "\r\n\r\n"); + delim = 1; + if (s == NULL) { + s = strstr(httpd->recvbuf, "\n\n"); + delim = 2; + } + if (s == NULL) + return (ISC_R_NOTFOUND); + + /* + * Determine if this is a POST or GET method. Any other values will + * cause an error to be returned. + */ + if (strncmp(httpd->recvbuf, "GET ", 4) == 0) { + httpd->method = ISC_HTTPD_METHODGET; + p = httpd->recvbuf + 4; + } else if (strncmp(httpd->recvbuf, "POST ", 5) == 0) { + httpd->method = ISC_HTTPD_METHODPOST; + p = httpd->recvbuf + 5; + } else { + return (ISC_R_RANGE); + } + + /* + * From now on, p is the start of our buffer. + */ + + /* + * Extract the URL. + */ + s = p; + while (LENGTHOK(s) && BUFLENOK(s) && + (*s != '\n' && *s != '\r' && *s != '\0' && *s != ' ')) + s++; + if (!LENGTHOK(s)) + return (ISC_R_NOTFOUND); + if (!BUFLENOK(s)) + return (ISC_R_NOMEMORY); + *s = 0; + + /* + * Make the URL relative. + */ + if ((strncmp(p, "http:/", 6) == 0) + || (strncmp(p, "https:/", 7) == 0)) { + /* Skip first / */ + while (*p != '/' && *p != 0) + p++; + if (*p == 0) + return (ISC_R_RANGE); + p++; + /* Skip second / */ + while (*p != '/' && *p != 0) + p++; + if (*p == 0) + return (ISC_R_RANGE); + p++; + /* Find third / */ + while (*p != '/' && *p != 0) + p++; + if (*p == 0) { + p--; + *p = '/'; + } + } + + httpd->url = p; + p = s + delim; + s = p; + + /* + * Now, see if there is a ? mark in the URL. If so, this is + * part of the query string, and we will split it from the URL. + */ + httpd->querystring = strchr(httpd->url, '?'); + if (httpd->querystring != NULL) { + *(httpd->querystring) = 0; + httpd->querystring++; + } + + /* + * Extract the HTTP/1.X protocol. We will bounce on anything but + * HTTP/1.1 for now. + */ + while (LENGTHOK(s) && BUFLENOK(s) && + (*s != '\n' && *s != '\r' && *s != '\0')) + s++; + if (!LENGTHOK(s)) + return (ISC_R_NOTFOUND); + if (!BUFLENOK(s)) + return (ISC_R_NOMEMORY); + *s = 0; + if ((strncmp(p, "HTTP/1.0", 8) != 0) + && (strncmp(p, "HTTP/1.1", 8) != 0)) + return (ISC_R_RANGE); + httpd->protocol = p; + p = s + 1; + s = p; + + if (strstr(s, "Connection: close") != NULL) + httpd->flags |= HTTPD_CLOSE; + + if (strstr(s, "Host: ") != NULL) + httpd->flags |= HTTPD_FOUNDHOST; + + /* + * Standards compliance hooks here. + */ + if (strcmp(httpd->protocol, "HTTP/1.1") == 0 + && ((httpd->flags & HTTPD_FOUNDHOST) == 0)) + return (ISC_R_RANGE); + + EXIT("request"); + + return (ISC_R_SUCCESS); +} + +static void +isc_httpd_accept(isc_task_t *task, isc_event_t *ev) +{ + isc_result_t result; + isc_httpdmgr_t *httpdmgr = ev->ev_arg; + isc_httpd_t *httpd; + isc_region_t r; + isc_socket_newconnev_t *nev = (isc_socket_newconnev_t *)ev; + + ENTER("accept"); + + LOCK(&httpdmgr->lock); + if (MSHUTTINGDOWN(httpdmgr)) { + NOTICE("accept shutting down, goto out"); + goto out; + } + + if (nev->result == ISC_R_CANCELED) { + NOTICE("accept canceled, goto out"); + goto out; + } + + if (nev->result != ISC_R_SUCCESS) { + /* XXHTTPG log failure */ + NOTICE("accept returned failure, goto requeue"); + goto requeue; + } + + httpd = isc_mem_get(httpdmgr->mctx, sizeof(isc_httpd_t)); + if (httpd == NULL) { + /* XXHTTPG log failure */ + NOTICE("accept failed to allocate memory, goto requeue"); + goto requeue; + } + + httpd->mgr = httpdmgr; + ISC_LINK_INIT(httpd, link); + ISC_LIST_APPEND(httpdmgr->running, httpd, link); + ISC_HTTPD_SETRECV(httpd); + httpd->sock = nev->newsocket; + httpd->flags = 0; + + /* + * Initialize the buffer for our headers. + */ + httpd->headerdata = isc_mem_get(httpdmgr->mctx, HTTP_SENDGROW); + if (httpd->headerdata == NULL) { + isc_mem_put(httpdmgr->mctx, httpd, sizeof(isc_httpd_t)); + goto requeue; + } + httpd->headerlen = HTTP_SENDGROW; + isc_buffer_init(&httpd->headerbuffer, httpd->headerdata, + httpd->headerlen); + + ISC_LIST_INIT(httpd->bufflist); + + isc_buffer_initnull(&httpd->bodybuffer); + reset_client(httpd); + + r.base = (unsigned char *)httpd->recvbuf; + r.length = HTTP_RECVLEN - 1; + result = isc_socket_recv(httpd->sock, &r, 1, task, isc_httpd_recvdone, + httpd); + NOTICE("accept queued recv on socket"); + + requeue: + result = isc_socket_accept(httpdmgr->sock, task, isc_httpd_accept, + httpdmgr); + if (result != ISC_R_SUCCESS) { + /* XXHTTPG what to do? Log failure... */ + NOTICE("accept could not reaccept due to failure"); + } + + out: + UNLOCK(&httpdmgr->lock); + + httpdmgr_destroy(httpdmgr); + + isc_event_free(&ev); + + EXIT("accept"); +} + +static isc_result_t +render_404(const char *url, const char *querystring, + void *arg, + unsigned int *retcode, const char **retmsg, + const char **mimetype, isc_buffer_t *b, + isc_httpdfree_t **freecb, void **freecb_args) +{ + char *msg = "No such URL."; + + UNUSED(url); + UNUSED(querystring); + UNUSED(arg); + + *retcode = 404; + *retmsg = "No such URL"; + *mimetype = "text/plain"; + isc_buffer_reinit(b, msg, strlen(msg)); + isc_buffer_add(b, strlen(msg)); + *freecb = NULL; + *freecb_args = NULL; + + return (ISC_R_SUCCESS); +} + +static void +isc_httpd_recvdone(isc_task_t *task, isc_event_t *ev) +{ + isc_region_t r; + isc_result_t result; + isc_httpd_t *httpd = ev->ev_arg; + isc_socketevent_t *sev = (isc_socketevent_t *)ev; + isc_httpdurl_t *url; + isc_time_t now; + char datebuf[32]; /* Only need 30, but safety first */ + + ENTER("recv"); + + INSIST(ISC_HTTPD_ISRECV(httpd)); + + if (sev->result != ISC_R_SUCCESS) { + NOTICE("recv destroying client"); + destroy_client(&httpd); + goto out; + } + + result = process_request(httpd, sev->n); + if (result == ISC_R_NOTFOUND) { + if (httpd->recvlen >= HTTP_RECVLEN - 1) { + destroy_client(&httpd); + goto out; + } + r.base = (unsigned char *)httpd->recvbuf + httpd->recvlen; + r.length = HTTP_RECVLEN - httpd->recvlen - 1; + result = isc_socket_recv(httpd->sock, &r, 1, task, + isc_httpd_recvdone, httpd); + goto out; + } else if (result != ISC_R_SUCCESS) { + destroy_client(&httpd); + goto out; + } + + ISC_HTTPD_SETSEND(httpd); + + /* + * XXXMLG Call function here. Provide an add-header function + * which will append the common headers to a response we generate. + */ + isc_buffer_initnull(&httpd->bodybuffer); + isc_time_now(&now); + isc_time_formathttptimestamp(&now, datebuf, sizeof(datebuf)); + url = ISC_LIST_HEAD(httpd->mgr->urls); + while (url != NULL) { + if (strcmp(httpd->url, url->url) == 0) + break; + url = ISC_LIST_NEXT(url, link); + } + if (url == NULL) + result = httpd->mgr->render_404(httpd->url, httpd->querystring, + NULL, + &httpd->retcode, + &httpd->retmsg, + &httpd->mimetype, + &httpd->bodybuffer, + &httpd->freecb, + &httpd->freecb_arg); + else + result = url->action(httpd->url, httpd->querystring, + url->action_arg, + &httpd->retcode, &httpd->retmsg, + &httpd->mimetype, &httpd->bodybuffer, + &httpd->freecb, &httpd->freecb_arg); + if (result != ISC_R_SUCCESS) { + destroy_client(&httpd); + goto out; + } + + isc_httpd_response(httpd); + isc_httpd_addheader(httpd, "Content-Type", httpd->mimetype); + isc_httpd_addheader(httpd, "Date", datebuf); + isc_httpd_addheader(httpd, "Expires", datebuf); + isc_httpd_addheader(httpd, "Last-Modified", datebuf); + isc_httpd_addheader(httpd, "Pragma: no-cache", NULL); + isc_httpd_addheader(httpd, "Cache-Control: no-cache", NULL); + isc_httpd_addheader(httpd, "Server: libisc", NULL); + isc_httpd_addheaderuint(httpd, "Content-Length", + isc_buffer_usedlength(&httpd->bodybuffer)); + isc_httpd_endheaders(httpd); /* done */ + + ISC_LIST_APPEND(httpd->bufflist, &httpd->headerbuffer, link); + /* + * Link the data buffer into our send queue, should we have any data + * rendered into it. If no data is present, we won't do anything + * with the buffer. + */ + if (isc_buffer_length(&httpd->bodybuffer) > 0) + ISC_LIST_APPEND(httpd->bufflist, &httpd->bodybuffer, link); + + httpd->freecb = NULL; + result = isc_socket_sendv(httpd->sock, &httpd->bufflist, task, + isc_httpd_senddone, httpd); + + out: + isc_event_free(&ev); + EXIT("recv"); +} + +void +isc_httpdmgr_shutdown(isc_httpdmgr_t **httpdmgrp) +{ + isc_httpdmgr_t *httpdmgr; + isc_httpd_t *httpd; + httpdmgr = *httpdmgrp; + *httpdmgrp = NULL; + + ENTER("isc_httpdmgr_shutdown"); + + LOCK(&httpdmgr->lock); + + MSETSHUTTINGDOWN(httpdmgr); + + isc_socket_cancel(httpdmgr->sock, httpdmgr->task, ISC_SOCKCANCEL_ALL); + + httpd = ISC_LIST_HEAD(httpdmgr->running); + while (httpd != NULL) { + isc_socket_cancel(httpd->sock, httpdmgr->task, + ISC_SOCKCANCEL_ALL); + httpd = ISC_LIST_NEXT(httpd, link); + } + + UNLOCK(&httpdmgr->lock); + + EXIT("isc_httpdmgr_shutdown"); +} + +static isc_result_t +grow_headerspace(isc_httpd_t *httpd) +{ + char *newspace; + unsigned int newlen; + isc_region_t r; + + newlen = httpd->headerlen + HTTP_SENDGROW; + if (newlen > HTTP_SEND_MAXLEN) + return (ISC_R_NOSPACE); + + newspace = isc_mem_get(httpd->mgr->mctx, newlen); + if (newspace == NULL) + return (ISC_R_NOMEMORY); + isc_buffer_region(&httpd->headerbuffer, &r); + isc_buffer_reinit(&httpd->headerbuffer, newspace, newlen); + + isc_mem_put(httpd->mgr->mctx, r.base, r.length); + + return (ISC_R_SUCCESS); +} + +isc_result_t +isc_httpd_response(isc_httpd_t *httpd) +{ + isc_result_t result; + unsigned int needlen; + + needlen = strlen(httpd->protocol) + 1; /* protocol + space */ + needlen += 3 + 1; /* room for response code, always 3 bytes */ + needlen += strlen(httpd->retmsg) + 2; /* return msg + CRLF */ + + if (isc_buffer_availablelength(&httpd->headerbuffer) < needlen) { + result = grow_headerspace(httpd); + if (result != ISC_R_SUCCESS) + return (result); + } + + sprintf(isc_buffer_used(&httpd->headerbuffer), "%s %03d %s\r\n", + httpd->protocol, httpd->retcode, httpd->retmsg); + isc_buffer_add(&httpd->headerbuffer, needlen); + + return (ISC_R_SUCCESS); +} + +isc_result_t +isc_httpd_addheader(isc_httpd_t *httpd, const char *name, + const char *val) +{ + isc_result_t result; + unsigned int needlen; + + needlen = strlen(name); /* name itself */ + if (val != NULL) + needlen += 2 + strlen(val); /* : and val */ + needlen += 2; /* CRLF */ + + if (isc_buffer_availablelength(&httpd->headerbuffer) < needlen) { + result = grow_headerspace(httpd); + if (result != ISC_R_SUCCESS) + return (result); + } + + if (val != NULL) + sprintf(isc_buffer_used(&httpd->headerbuffer), + "%s: %s\r\n", name, val); + else + sprintf(isc_buffer_used(&httpd->headerbuffer), + "%s\r\n", name); + + isc_buffer_add(&httpd->headerbuffer, needlen); + + return (ISC_R_SUCCESS); +} + +isc_result_t +isc_httpd_endheaders(isc_httpd_t *httpd) +{ + isc_result_t result; + + if (isc_buffer_availablelength(&httpd->headerbuffer) < 2) { + result = grow_headerspace(httpd); + if (result != ISC_R_SUCCESS) + return (result); + } + + sprintf(isc_buffer_used(&httpd->headerbuffer), "\r\n"); + isc_buffer_add(&httpd->headerbuffer, 2); + + return (ISC_R_SUCCESS); +} + +isc_result_t +isc_httpd_addheaderuint(isc_httpd_t *httpd, const char *name, int val) { + isc_result_t result; + unsigned int needlen; + char buf[sizeof "18446744073709551616"]; + + sprintf(buf, "%d", val); + + needlen = strlen(name); /* name itself */ + needlen += 2 + strlen(buf); /* : and val */ + needlen += 2; /* CRLF */ + + if (isc_buffer_availablelength(&httpd->headerbuffer) < needlen) { + result = grow_headerspace(httpd); + if (result != ISC_R_SUCCESS) + return (result); + } + + sprintf(isc_buffer_used(&httpd->headerbuffer), + "%s: %s\r\n", name, buf); + + isc_buffer_add(&httpd->headerbuffer, needlen); + + return (ISC_R_SUCCESS); +} + +static void +isc_httpd_senddone(isc_task_t *task, isc_event_t *ev) +{ + isc_httpd_t *httpd = ev->ev_arg; + isc_region_t r; + isc_result_t result; + isc_socketevent_t *sev = (isc_socketevent_t *)ev; + + ENTER("senddone"); + INSIST(ISC_HTTPD_ISSEND(httpd)); + + /* + * First, unlink our header buffer from the socket's bufflist. This + * is sort of an evil hack, since we know our buffer will be there, + * and we know it's address, so we can just remove it directly. + */ + NOTICE("senddone unlinked header"); + ISC_LIST_UNLINK(sev->bufferlist, &httpd->headerbuffer, link); + + /* + * We will always want to clean up our receive buffer, even if we + * got an error on send or we are shutting down. + * + * We will pass in the buffer only if there is data in it. If + * there is no data, we will pass in a NULL. + */ + if (httpd->freecb != NULL) { + isc_buffer_t *b = NULL; + if (isc_buffer_length(&httpd->bodybuffer) > 0) + b = &httpd->bodybuffer; + httpd->freecb(b, httpd->freecb_arg); + NOTICE("senddone free callback performed"); + } + if (ISC_LINK_LINKED(&httpd->bodybuffer, link)) { + ISC_LIST_UNLINK(sev->bufferlist, &httpd->bodybuffer, link); + NOTICE("senddone body buffer unlinked"); + } + + if (sev->result != ISC_R_SUCCESS) { + destroy_client(&httpd); + goto out; + } + + if ((httpd->flags & HTTPD_CLOSE) != 0) { + destroy_client(&httpd); + goto out; + } + + ISC_HTTPD_SETRECV(httpd); + + NOTICE("senddone restarting recv on socket"); + + reset_client(httpd); + + r.base = (unsigned char *)httpd->recvbuf; + r.length = HTTP_RECVLEN - 1; + result = isc_socket_recv(httpd->sock, &r, 1, task, isc_httpd_recvdone, + httpd); + +out: + isc_event_free(&ev); + EXIT("senddone"); +} + +static void +reset_client(isc_httpd_t *httpd) +{ + /* + * Catch errors here. We MUST be in RECV mode, and we MUST NOT have + * any outstanding buffers. If we have buffers, we have a leak. + */ + INSIST(ISC_HTTPD_ISRECV(httpd)); + INSIST(!ISC_LINK_LINKED(&httpd->headerbuffer, link)); + INSIST(!ISC_LINK_LINKED(&httpd->bodybuffer, link)); + + httpd->recvbuf[0] = 0; + httpd->recvlen = 0; + httpd->method = ISC_HTTPD_METHODUNKNOWN; + httpd->url = NULL; + httpd->querystring = NULL; + httpd->protocol = NULL; + httpd->flags = 0; + + isc_buffer_clear(&httpd->headerbuffer); + isc_buffer_invalidate(&httpd->bodybuffer); +} + +isc_result_t +isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, + isc_httpdaction_t *func, void *arg) +{ + isc_httpdurl_t *item; + + if (url == NULL) { + httpdmgr->render_404 = func; + return (ISC_R_SUCCESS); + } + + item = isc_mem_get(httpdmgr->mctx, sizeof(isc_httpdurl_t)); + if (item == NULL) + return (ISC_R_NOMEMORY); + + item->url = isc_mem_strdup(httpdmgr->mctx, url); + if (item->url == NULL) { + isc_mem_put(httpdmgr->mctx, item, sizeof(isc_httpdurl_t)); + return (ISC_R_NOMEMORY); + } + + item->action = func; + item->action_arg = arg; + ISC_LINK_INIT(item, link); + ISC_LIST_APPEND(httpdmgr->urls, item, link); + + return (ISC_R_SUCCESS); +} diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h new file mode 100644 index 00000000000..a13e80663af --- /dev/null +++ b/lib/isc/include/isc/httpd.h @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * + * 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 ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC 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: httpd.h,v 1.2 2006/11/13 20:07:57 explorer Exp $ */ + +#ifndef ISC_HTTPD_H +#define ISC_HTTPD_H 1 + +/*! \file */ + +#include +#include +#include +#include +#include + +#define HTTPD_EVENTCLASS ISC_EVENTCLASS(4300) +#define HTTPD_SHUTDOWN (HTTPD_EVENTCLASS + 0x0001) + +#define ISC_HTTPDMGR_FLAGSHUTTINGDOWN 0x00000001 + +/* + * Create a new http daemon which will send, once every time period, + * a http-like header followed by HTTP data. + */ +isc_result_t +isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *socket, isc_task_t *task, + isc_timermgr_t *tmgr, isc_httpdmgr_t **httpdp); + +void +isc_httpdmgr_shutdown(isc_httpdmgr_t **httpdp); + +isc_result_t +isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, + isc_httpdaction_t func, void *arg); + +isc_result_t +isc_httpd_response(isc_httpd_t *httpd); + +isc_result_t +isc_httpd_addheader(isc_httpd_t *httpd, const char *name, + const char *val); + +isc_result_t +isc_httpd_addheaderuint(isc_httpd_t *httpd, const char *name, int val); + +isc_result_t isc_httpd_endheaders(isc_httpd_t *httpd); + +#endif /* ISC_HTTPD_H */ diff --git a/lib/isc/include/isc/mib.h b/lib/isc/include/isc/mib.h new file mode 100644 index 00000000000..adf36006ca8 --- /dev/null +++ b/lib/isc/include/isc/mib.h @@ -0,0 +1,222 @@ +/* + * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * + * 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 ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC 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: mib.h,v 1.2 2006/11/13 20:07:57 explorer Exp $ */ + +#ifndef ISC_MIB_H +#define ISC_MIB_H + +/*! \file mib.h + * \brief Statistics structures. + * + * \li MP: + * The statistics structures defined in this file handle all locking + * provided the API is used properly. + * + * This module defines a MIB database. + * + * Two entities are defined: providers and consumers. Providers will + * create and attach mib elements to the root or to other nodes, and update + * the MIB elements themselves. Consumers will read this data. + * + * Note that consumers cannot currently update the MIB, just read it. We + * may want to add this later. + * + * General assumptions about the use of the mib system, and design + * requirements: + * + * (1) Mib must be fast to update, with as little locking as feasable. + * On simple integers, this should require no locks if the system + * supports atomic increments and reads of integers. + * + * (2) Mib must be fast to read, also with as little locking as possible. + * The mib tree has a read/write lock to protect the structure of + * the entire mib tree. + * + * (3) The mib tree itself is expected to be updated infrequently, and + * so a simple read/write lock is used to protect the struture. + * + * (4) Sometimes complicated data will require special handling to protect + * during read or updates. When this is necessary, a pointer to a lock + * structure can be associated with each mib variable. This lock + * can be shared (for space savings). + * + * Constraints of use: + * + * (1) Each mib structure has an implied owner, which may be a module, an + * "object" like a zone, or other distinct object. It is required the + * owner of the mib node will be the one to create, modify the structure + * of, and delete it as needed. + * + * (2) The mib structure must be fully configured before inserting it into + * the tree. However, mib objects can be added and removed dynamically + * as required. + * + * (3) Mib have names. These names cannot contain periods, as this is + * used as the delimiter between names. + * + * (4) Walking a list of nodes must be done in the forward order only, never + * in the reverse direction. This is to avoid deadlocks, and to optimize + * locking. Locking will only be performed as needed while walking the + * mibnode list, and if the lock needed does not change it will not + * be unlocked until isc_mib_iterunlock() is called to explicitly + * unlock, or isc_mib_iterdestroy() is called to implicitly unlock it. + * + * (5) When walking the tree, or updating statistics, it is required that + * the mibnode locks be held for as little a time as possible. Any + * data should be copied quickly or the lock should be explicitly + * released. + * + * (6) When updating mib, the mibnode lock should be held as little as + * possible. + * + * (7) Even with locks there is no guarantee they will always be used, so + * users of this cannot assume reading two or more variables which + * share the same statistics lock will result in consistent data. For + * example, if there are three data items, "a", "b", and "total", where + * total = a + b, it is possible "a" will be updated using atomic + * operations, and then "total" will be incremented using the same + * operations. Atomic operations on integers will not always use the + * node's lock, so it is possible that total will not always be the sum + * of "a" and "b". + * + * (8) Consumers are read-only -- no modification is allowed. Search + * functions will return data that must not be modified. Removal of + * a node implies that the node's exact pointer is known. That is, + * no search is needed. Searching then removing a node is considered + * a misuse of this API. + */ + +#include +#include +#include +#include +#include +#include + +#define ISC_MIB_MAXNAME 12 /* max mib length */ +#define ISC_MIB_NAMELEN 32 /* longest ASCII name length per node */ +#define ISC_MIB_DEFSIZE 8 /* default object set size */ + +/* + * Node types. + */ +#define ISC_MIBNODETYPE_INVALID 0 /* Invalid node */ +#define ISC_MIBNODETYPE_NODE 1 /* node is a node */ +#define ISC_MIBNODETYPE_UINT32 2 /* node is an unsigned 32-bit integer */ +#define ISC_MIBNODETYPE_INT32 3 /* node is an signed 32-bit integer */ +#define ISC_MIBNODETYPE_UINT64 4 /* node is an unsigned 64-bit integer */ +#define ISC_MIBNODETYPE_INT64 5 /* node is an signed 64-bit integer */ +#define ISC_MIBNODETYPE_STRING 6 /* node is a string */ + +/* + * Node flags. These define flags used on isc_mibnode_t. + */ +#define ISC_MIBNODEFLAG_PERMANENT 0x00000001 /* cannot free */ + +typedef struct isc_mibnode isc_mibnode_t; +typedef struct isc_mib isc_mib_t; + +/* + * This is a description of the data element we are tracking. We call this + * a "node." + */ +struct isc_mibnode { + isc_uint32_t type; + isc_uint32_t flags; + char *name; + isc_mibnode_t *parent; + isc_mutex_t *lock; + void *data; /* used if we are a data node */ + ISC_LIST(isc_mibnode_t) nodes; /* used if we are a list node */ + ISC_LINK(isc_mibnode_t) link; +}; + +/* + * Initialize a tree's root node. + */ +isc_result_t isc_mib_create(isc_mem_t *mem, isc_mib_t **rootp); + +/* + * Destroy a MIB. + */ +void isc_mib_destroy(isc_mib_t **rootp); + +/* + * FUNCTIONS BELOW THIS POINT SHOULD BE CALLED ONLY FROM PROVIDERS. + */ + +/* + * Create and initialize a new node. This will allocate a node structure, + * and call isc_mibnode_init() to initialize it. + * + * This function allocates memory, so a corresponding call to + * isc_mibnode_destroy() must be made to free the memory allocated by + * this function and by isc_mibnode_init(). + */ +isc_result_t isc_mibnode_create(isc_mib_t *mib, isc_uint32_t type, + const char *name, + isc_uint32_t flags, isc_mutex_t *lock, + void *item, unsigned int itemlen, + isc_mibnode_t **nodep); + +/* + * Initialize a static or pre-allocated node. + * This will set it up but NOT link it into the tree. + * + * This function allocates memory from the mib's memory context, so a + * call to isc_mibnode_invalidate() must be called to destroy it. + */ +isc_result_t isc_mibnode_init(isc_mib_t *mib, isc_mibnode_t *node, + isc_uint32_t type, const char *name, + isc_mutex_t *lock, isc_uint32_t flags, + void *item, unsigned int itemlen); + +void isc_mibnode_invalidate(isc_mib_t *mib, isc_mibnode_t *node); + +void isc_mib_add(isc_mib_t *root, isc_mibnode_t *parent, isc_mibnode_t *node); +void isc_mib_remove(isc_mib_t *root, isc_mibnode_t *node); + +void isc_mibnode_destroy(isc_mib_t *mib, isc_mibnode_t **nodep); +isc_boolean_t isc_mibnode_haschildren(isc_mibnode_t *node); + +/* + * Walk a mib. This performs a depth-first traversal of the mib tree. + * Locking is automatic. After walking is completed, isc_mib_release() + * must be called. + * + * Also, have a way to find a node's parent. + */ +isc_mibnode_t *isc_mib_firstnode(isc_mib_t *mib, isc_mibnode_t *parent); +isc_mibnode_t *isc_mib_nextnode(isc_mib_t *mib, isc_mibnode_t *previous); +isc_mibnode_t *isc_mib_parent(isc_mib_t *mib, isc_mibnode_t *node); + +/* + * Release any locks held on the mib and node. + * This is the last step in searching and tree-walking. + * + * If 'node' is NULL, only the tree is unlocked. + */ +void isc_mib_unlock(isc_mib_t *mib, isc_mibnode_t *node); +void isc_mib_lock(isc_mib_t *mib, isc_mibnode_t *node); + +void +isc_mibnode_getdata(isc_mibnode_t *node, + isc_mibnode_t *previous, + isc_boolean_t lock, + void *item, unsigned int itemlen); + +#endif /* ISC_MIB_H */ diff --git a/lib/isc/mib.c b/lib/isc/mib.c new file mode 100644 index 00000000000..9d6c7d8813d --- /dev/null +++ b/lib/isc/mib.c @@ -0,0 +1,357 @@ +/* + * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * + * 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 ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC 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: mib.c,v 1.2 2006/11/13 20:07:57 explorer Exp $ */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +/* + * The root of a statistics tree. + * + * We use a isc_refcount_t for reference counting, which is a self-locked + * type. It is very efficient and may use atomic operations rather than + * locks. + */ +struct isc_mib { + isc_mem_t *mem; + isc_rwlock_t rwlock; + ISC_LIST(isc_mibnode_t) nodes; + isc_refcount_t refs; +}; + +isc_result_t +isc_mib_create(isc_mem_t *mem, isc_mib_t **rootp) +{ + isc_result_t result; + isc_mib_t *root; + + REQUIRE(rootp != NULL && *rootp == NULL); + + root = isc_mem_get(mem, sizeof *root); + if (root == NULL) + return (ISC_R_NOMEMORY); + + result = isc_rwlock_init(&root->rwlock, 0, 0); + if (result != ISC_R_SUCCESS) { + isc_mem_put(mem, root, sizeof *root); + return (result); + } + + ISC_LIST_INIT(root->nodes); + + root->mem = NULL; + isc_mem_attach(mem, &root->mem); + + isc_refcount_init(&root->refs, 1); + + *rootp = root; + + return (ISC_R_SUCCESS); +} + +isc_result_t +isc_mibnode_create(isc_mib_t *mib, isc_uint32_t type, + const char *name, isc_uint32_t flags, + isc_mutex_t *lock, void *item, unsigned int itemlen, + isc_mibnode_t **nodep) +{ + isc_result_t result; + isc_mibnode_t *node; + + REQUIRE(nodep != NULL && *nodep == NULL); + REQUIRE((flags & ISC_MIBNODEFLAG_PERMANENT) == 0); + + node = isc_mem_get(mib->mem, sizeof *node); + if (node == NULL) + return (ISC_R_NOMEMORY); + + *nodep = node; + + result = isc_mibnode_init(mib, node, type, name, lock, flags, + item, itemlen); + + return (result); +} + +void +isc_mibnode_destroy(isc_mib_t *mib, isc_mibnode_t **nodep) +{ + isc_mibnode_t *node; + + REQUIRE(nodep != NULL && *nodep != NULL); + + node = *nodep; + REQUIRE((node->flags & ISC_MIBNODEFLAG_PERMANENT) == 0); + isc_mibnode_invalidate(mib, node); + *nodep = NULL; + + isc_mem_put(mib->mem, node, sizeof *node); +} + +/* + * XXXMLG Should break this out into two functions, one which is used + * internally for most of the setting, and another which simply makes + * certain that the ISC_MIBNODEFLAG_PERMANENT is set when the client calls + * _init() and _invalidate() directly. + */ +void +isc_mibnode_invalidate(isc_mib_t *mib, isc_mibnode_t *node) +{ + REQUIRE(node != NULL); + REQUIRE(!ISC_LINK_LINKED(node, link)); + + switch (node->type) { + case ISC_MIBNODETYPE_NODE: + REQUIRE(ISC_LIST_EMPTY(node->nodes)); + break; + } + + isc_mem_free(mib->mem, node->name); + node = ISC_MIBNODETYPE_INVALID; +} + +/* + * Initialize a statically allocated mibnode. The caller will need to call + * isc_mibnode_invalidate() after it is no longer in use. + */ +isc_result_t +isc_mibnode_init(isc_mib_t *mib, isc_mibnode_t *node, isc_uint32_t type, + const char *name, isc_mutex_t *lock, isc_uint32_t flags, + void *item, unsigned int itemlen) +{ + REQUIRE(mib != NULL); + REQUIRE(node != NULL); + REQUIRE(name != NULL); + + ISC_LINK_INIT(node, link); + node->type = type; + node->name = isc_mem_strdup(mib->mem, name); + if (node->name == NULL) + return (ISC_R_NOMEMORY); + node->parent = NULL; + node->lock = NULL; + node->flags = flags; + node->lock = lock; + ISC_LIST_INIT(node->nodes); + + switch (type) { + case ISC_MIBNODETYPE_NODE: + break; + case ISC_MIBNODETYPE_STRING: + REQUIRE(itemlen >= sizeof(char *)); + node->data = item; + break; + case ISC_MIBNODETYPE_UINT32: + case ISC_MIBNODETYPE_INT32: + REQUIRE(itemlen >= sizeof(isc_uint32_t)); + node->data = item; + break; + case ISC_MIBNODETYPE_UINT64: + case ISC_MIBNODETYPE_INT64: + REQUIRE(itemlen >= sizeof(isc_uint64_t)); + node->data = item; + break; + default: + isc_error_runtimecheck(__FILE__, __LINE__, + "Invalid type"); + } + + return (ISC_R_SUCCESS); +} + +void +isc_mib_destroy(isc_mib_t **rootp) +{ + isc_mib_t *root; + isc_mem_t *mem; + unsigned int refs; + + REQUIRE(rootp != NULL && *rootp != NULL); + + root = *rootp; + rootp = NULL; + + isc_refcount_decrement(&root->refs, &refs); + INSIST(refs == 0); + isc_refcount_destroy(&root->refs); + + REQUIRE(ISC_LIST_EMPTY(root->nodes)); + + /* record and then forget the root's memory context */ + mem = root->mem; + root->mem = NULL; + + isc_rwlock_destroy(&root->rwlock); + + isc_mem_putanddetach(&mem, root, sizeof *root); +} + +void +isc_mib_add(isc_mib_t *root, isc_mibnode_t *parent, isc_mibnode_t *node) +{ + REQUIRE(root != NULL); + REQUIRE(node != NULL); + + RWLOCK(&root->rwlock, isc_rwlocktype_write); + isc_refcount_increment(&root->refs, NULL); + + if (parent == NULL) { + ISC_LIST_APPEND(root->nodes, node, link); + node->parent = NULL; + } else { + REQUIRE(parent->type == ISC_MIBNODETYPE_NODE); + ISC_LIST_APPEND(parent->nodes, node, link); + node->parent = parent; + } + + RWUNLOCK(&root->rwlock, isc_rwlocktype_write); +} + +void +isc_mib_remove(isc_mib_t *root, isc_mibnode_t *node) +{ + REQUIRE(root != NULL); + REQUIRE(node != NULL); + + RWLOCK(&root->rwlock, isc_rwlocktype_write); + isc_refcount_decrement(&root->refs, NULL); + + if (node->parent == NULL) + ISC_LIST_UNLINK(root->nodes, node, link); + else + ISC_LIST_UNLINK(node->parent->nodes, node, link); + node->parent = NULL; + + RWUNLOCK(&root->rwlock, isc_rwlocktype_write); +} + +isc_boolean_t +isc_mibnode_haschildren(isc_mibnode_t *node) +{ + REQUIRE(node != NULL); + REQUIRE(node->type == ISC_MIBNODETYPE_NODE); + + if (ISC_LIST_HEAD(node->nodes) == NULL) + return (ISC_FALSE); + return (ISC_TRUE); +} + +isc_mibnode_t * +isc_mib_firstnode(isc_mib_t *mib, isc_mibnode_t *parent) +{ + isc_mibnode_t *node; + + if (parent != NULL) { + node = ISC_LIST_HEAD(parent->nodes); + } else { + node = ISC_LIST_HEAD(mib->nodes); + } + if (node != NULL && node->lock != NULL) + LOCK(node->lock); + + return (node); +} + +isc_mibnode_t * +isc_mib_nextnode(isc_mib_t *mib, isc_mibnode_t *previous) +{ + isc_mibnode_t *node; + + UNUSED(mib); + + node = ISC_LIST_NEXT(previous, link); + + /* + * Could optimize this... XXXMLG + */ + if (previous != NULL && previous->lock != NULL) + UNLOCK(previous->lock); + if (node != NULL && node->lock != NULL) + LOCK(node->lock); + + return (node); +} + +isc_mibnode_t * +isc_mib_parent(isc_mib_t *mib, isc_mibnode_t *node) +{ + UNUSED(mib); + + return (node->parent); +} + +void +isc_mib_lock(isc_mib_t *mib, isc_mibnode_t *node) +{ + RWLOCK(&mib->rwlock, isc_rwlocktype_read); + isc_refcount_increment(&mib->refs, NULL); + + if (node != NULL && node->lock != NULL) + LOCK(node->lock); +} + +void +isc_mib_unlock(isc_mib_t *mib, isc_mibnode_t *node) +{ + if (node != NULL && node->lock != NULL) + UNLOCK(node->lock); + if (mib != NULL) { + RWUNLOCK(&mib->rwlock, isc_rwlocktype_read); + isc_refcount_decrement(&mib->refs, NULL); + } +} + +void +isc_mibnode_getdata(isc_mibnode_t *node, isc_mibnode_t *previous, + isc_boolean_t lock, void *item, unsigned int itemlen) +{ + if (previous != NULL && previous->lock != NULL) + UNLOCK(previous->lock); + if (lock && node != NULL && node->lock != NULL) + LOCK(node->lock); + + switch (node->type) { + case ISC_MIBNODETYPE_NODE: + break; + case ISC_MIBNODETYPE_STRING: + REQUIRE(itemlen >= sizeof(char *)); + *((char *)(item)) = *((char *)(node->data)); + break; + case ISC_MIBNODETYPE_UINT32: + case ISC_MIBNODETYPE_INT32: + REQUIRE(itemlen >= sizeof(isc_uint32_t)); + *((isc_uint32_t *)(item)) = *((isc_uint32_t *)(node->data)); + break; + case ISC_MIBNODETYPE_UINT64: + case ISC_MIBNODETYPE_INT64: + REQUIRE(itemlen >= sizeof(isc_uint64_t)); + *((isc_uint64_t *)(item)) = *((isc_uint64_t *)(node->data)); + break; + default: + isc_error_runtimecheck(__FILE__, __LINE__, + "Invalid type"); + } +} diff --git a/xml/statistics-schema.rnc b/xml/statistics-schema.rnc new file mode 100644 index 00000000000..ce1bef30c22 --- /dev/null +++ b/xml/statistics-schema.rnc @@ -0,0 +1,65 @@ +# default namespace = "http://isc.org/isc/1.0/statistics/1.0/" + +start = isc + +isc = element isc { attribute version { xsd:string }, statistics } + +statistics = element statistics { + attribute version { xsd:string }, + node+ +} + +node = element node { + ( attribute name { xsd:string } + & attribute id { xsd:integer } + & attribute description { xsd:string }* + ), + ( node | statistic )+ +} + +statistic = ( stat-ui32 | stat-i32 | stat-ui64 | stat-i64 | stat-string )* + +stat-ui32 = element statistic { + ( attribute name { xsd:string } + & attribute id { xsd:int } + & attribute description { xsd:string }* + & attribute type { xsd:string { pattern = "uint32" } } + ), + xsd:unsignedInt +} + +stat-i32 = element statistic { + ( attribute name { xsd:string } + & attribute id { xsd:int } + & attribute description { xsd:string }* + & attribute type { xsd:string { pattern = "int32" } } + ), + xsd:int +} + +stat-ui64 = element statistic { + ( attribute name { xsd:string } + & attribute id { xsd:int } + & attribute description { xsd:string }* + & attribute type { xsd:string { pattern = "uint64" } } + ), + xsd:unsignedLong +} + +stat-i64 = element statistic { + ( attribute name { xsd:string } + & attribute id { xsd:int } + & attribute description { xsd:string }* + & attribute type { xsd:string { pattern = "int64" } } + ), + xsd:long +} + +stat-string = element statistic { + ( attribute name { xsd:string } + & attribute id { xsd:int } + & attribute description { xsd:string }* + & attribute type { xsd:string { pattern = "string" } } + ), + xsd:string +} diff --git a/xml/statistics-schema.xml b/xml/statistics-schema.xml new file mode 100644 index 00000000000..7d9c8af54fe --- /dev/null +++ b/xml/statistics-schema.xml @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uint32 + + + + + + + + + + + + + + + + + + + + + + + int32 + + + + + + + + + + + + + + + + + + + + + + + uint64 + + + + + + + + + + + + + + + + + + + + + + + int64 + + + + + + + + + + + + + + + + + + + + + + + string + + + + + + +