From 48873b11cc7f101bd5f3eb74fedacce40e73dd91 Mon Sep 17 00:00:00 2001 From: m0gg Date: Sat, 25 Nov 2006 16:35:57 +0000 Subject: Documentation enhancements --- examples/nanohttp/http_server.c | 10 ++--- examples/nanohttp/httpget.c | 74 ------------------------------------- libcsoap/soap-addressing.h | 24 ++++++++++-- libcsoap/soap-admin.c | 6 +-- libcsoap/soap-nhttp.c | 6 +-- libcsoap/soap-wsil.c | 6 +-- nanohttp/nanohttp-admin.c | 6 +-- nanohttp/nanohttp-common.h | 81 ++++++++++++++++++++++++++++++++++++++++- nanohttp/nanohttp-server.c | 6 +-- 9 files changed, 120 insertions(+), 99 deletions(-) delete mode 100644 examples/nanohttp/httpget.c diff --git a/examples/nanohttp/http_server.c b/examples/nanohttp/http_server.c index 655ad7a..0e1659a 100644 --- a/examples/nanohttp/http_server.c +++ b/examples/nanohttp/http_server.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: http_server.c,v 1.8 2006/11/25 15:06:57 m0gg Exp $ +* $Id: http_server.c,v 1.9 2006/11/25 16:35:57 m0gg Exp $ * * CSOAP Project: A http client/server library in C (example) * Copyright (C) 2003 Ferhat Ayaz @@ -55,7 +55,7 @@ static int simple_authenticator(struct hrequest_t *req, const char *user, const static void secure_service(httpd_conn_t *conn, struct hrequest_t *req) { - httpd_send_header(conn, 200, "OK"); + httpd_send_header(conn, 200, HTTP_STATUS_200_REASON_PHRASE); http_output_stream_write_string(conn->out, "" "" @@ -72,7 +72,7 @@ static void secure_service(httpd_conn_t *conn, struct hrequest_t *req) static void default_service(httpd_conn_t *conn, struct hrequest_t *req) { - httpd_send_header(conn, 404, "Not found"); + httpd_send_header(conn, 404, HTTP_STATUS_404_REASON_PHRASE); http_output_stream_write_string(conn->out, "" "" @@ -96,7 +96,7 @@ static void headers_service(httpd_conn_t *conn, struct hrequest_t *req) { hpair_t *walker; - httpd_send_header(conn, 200, "OK"); + httpd_send_header(conn, 200, HTTP_STATUS_200_REASON_PHRASE); http_output_stream_write_string(conn->out, "" "" @@ -125,7 +125,7 @@ static void headers_service(httpd_conn_t *conn, struct hrequest_t *req) static void root_service(httpd_conn_t *conn, struct hrequest_t *req) { - httpd_send_header(conn, 200, "OK"); + httpd_send_header(conn, 200, HTTP_STATUS_200_REASON_PHRASE); http_output_stream_write_string(conn->out, "" "" diff --git a/examples/nanohttp/httpget.c b/examples/nanohttp/httpget.c deleted file mode 100644 index e70469d..0000000 --- a/examples/nanohttp/httpget.c +++ /dev/null @@ -1,74 +0,0 @@ -/****************************************************************** -* $Id: httpget.c,v 1.4 2004/09/19 07:05:03 snowdrop Exp $ -* -* CSOAP Project: A http client/server library in C (example) -* Copyright (C) 2003 Ferhat Ayaz -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Library General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Library General Public License for more details. -* -* You should have received a copy of the GNU Library General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Email: ayaz@jprogrammer.net -******************************************************************/ -#include - -#include - - -int main(int argc, char *argv[]) -{ - httpc_conn_t *conn; - hresponse_t *res; - hpair_t *pair; - - if (argc < 2) { - fprintf(stderr, "usage %s \n", argv[0]); - exit(1); - } - - log_set_level(HLOG_VERBOSE); - if (httpc_init(argc, argv)) - { - log_error1("Can not init httpc"); - return 1; - } - - conn = httpc_new(); - res = httpc_get(conn, argv[1]); - - if (res != NULL) { - log_info2("Spec : '%s'", res->spec); - log_info2("Status: %d", res->errcode); - log_info2("Desc : '%s'", res->desc); - - if (res->body) { - pair = res->header; - while (pair != NULL) { - log_debug3("%s: %s", pair->key, pair->value); - pair = pair->next; - } - - puts(res->body); - } - else - log_error1("body is null"); - - hresponse_free(res); - } else { - log_error1("response object is null"); - } - - httpc_free(conn); - return 0; -} diff --git a/libcsoap/soap-addressing.h b/libcsoap/soap-addressing.h index 0893ac5..ed2ca86 100644 --- a/libcsoap/soap-addressing.h +++ b/libcsoap/soap-addressing.h @@ -1,5 +1,5 @@ /****************************************************************** - * $Id: soap-addressing.h,v 1.4 2006/11/24 10:54:03 m0gg Exp $ + * $Id: soap-addressing.h,v 1.5 2006/11/25 16:35:57 m0gg Exp $ * * CSOAP Project: A SOAP client/server library in C * Copyright (C) 2006 Heiko Ronsdorf @@ -24,7 +24,7 @@ #ifndef __csoap_addressing_h #define __csoap_addressing_h -/** +/** @file * * WS-Addressing provides transport-neutral mechanisms to address Web services * and messages. Specifically, this specification defines XML [XML 1.0, XML @@ -35,11 +35,27 @@ * in a transport-neutral manner. * * @author H. Ronsdorf - * @version $Revision: 1.4 $ - * @see http://www.w3.org/TR/ws-addr-core/ + * @version $Revision: 1.5 $ + * + * @see http://www.w3.org/TR/ws-addr-core/, + * http://www.w3.org/TR/REC-xml-names/ + * + */ + +/** + * + * Namespace used for the addressing elements. * */ #define WSA_NAMESPACE "http://www.w3.org/2005/08/addressing" + +/** + * + * Prefix for the WSA namespace used internally. + * + * @see WSA_NAMESPACE + * + */ #define WSA_NAMESPACE_PREFIX "wsa" /** diff --git a/libcsoap/soap-admin.c b/libcsoap/soap-admin.c index 20b3412..81310ed 100644 --- a/libcsoap/soap-admin.c +++ b/libcsoap/soap-admin.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: soap-admin.c,v 1.8 2006/11/25 15:06:57 m0gg Exp $ +* $Id: soap-admin.c,v 1.9 2006/11/25 16:35:57 m0gg Exp $ * * CSOAP Project: A SOAP client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -60,7 +60,7 @@ static void _soap_admin_send_title(httpd_conn_t *conn, const char *title) { - httpd_send_header(conn, 200, "OK"); + httpd_send_header(conn, 200, HTTP_STATUS_200_REASON_PHRASE); http_output_stream_write_string(conn->out, "