Applying current development branch to 1.4.x stable branch.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.4.x@30 119443c7-1b9e-41f8-b6fc-b9c35fce742c

upnp/src/genlib/net/http/parsetools.c

@@ -0,0 +1,71 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////
+
+/************************************************************************
+* Purpose: This file a function to extract the header information from	*
+* an http message and then matches the data with XML data.				*
+************************************************************************/
+
+#include "config.h"
+#include <assert.h>
+#include "util.h"
+#include "membuffer.h"
+#include "httpparser.h"
+#include "statcodes.h"
+#include "parsetools.h"
+
+/************************************************************************
+* Function: has_xml_content_type										
+*																		
+* Parameters:															
+*	IN http_message_t* hmsg	; HTTP Message object
+*																		
+* Description: Find the header from the HTTP message and match the		
+*	header for xml data.												
+*																		
+* Returns:																
+*	 BOOLEAN															
+************************************************************************/
+xboolean
+has_xml_content_type( IN http_message_t * hmsg )
+{
+    memptr hdr_value;
+
+    assert( hmsg );
+
+    // find 'content-type' header which must have text/xml
+    if( httpmsg_find_hdr( hmsg, HDR_CONTENT_TYPE, &hdr_value ) != NULL &&
+        matchstr( hdr_value.buf, hdr_value.length,
+                  "%itext%w/%wxml" ) == PARSE_OK ) {
+        return TRUE;
+    }
+    return FALSE;
+}

upnp/src/genlib/net/http/statcodes.c

@@ -0,0 +1,210 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////
+
+/************************************************************************
+* Purpose: This file defines status codes, buffers to store the status	*
+* messages and functions to manipulate those buffers					*
+************************************************************************/
+
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+#include "util.h"
+#include "statcodes.h"
+
+#ifdef WIN32
+ #include "unixutil.h"
+#endif
+
+#define NUM_1XX_CODES   2
+static const char *Http1xxCodes[NUM_1XX_CODES];
+static const char *Http1xxStr = "Continue\0" "Switching Protocols\0";
+
+#define NUM_2XX_CODES   7
+static const char *Http2xxCodes[NUM_2XX_CODES];
+static const char *Http2xxStr =
+    "OK\0"
+    "Created\0"
+    "Accepted\0"
+    "Non-Authoratative Information\0"
+    "No Content\0" "Reset Content\0" "Partial Content\0";
+
+#define NUM_3XX_CODES   8
+static const char *Http3xxCodes[NUM_3XX_CODES];
+static const char *Http3xxStr =
+    "Multiple Choices\0"
+    "Moved Permanently\0"
+    "Found\0"
+    "See Other\0"
+    "Not Modified\0" "Use Proxy\0" "\0" "Temporary Redirect\0";
+
+#define NUM_4XX_CODES   18
+static const char *Http4xxCodes[NUM_4XX_CODES];
+static const char *Http4xxStr =
+    "Bad Request\0"
+    "Unauthorized\0"
+    "Payment Required\0"
+    "Forbidden\0"
+    "Not Found\0"
+    "Method Not Allowed\0"
+    "Not Acceptable\0"
+    "Proxy Authentication Required\0"
+    "Request Timeout\0"
+    "Conflict\0"
+    "Gone\0"
+    "Length Required\0"
+    "Precondition Failed\0"
+    "Request Entity Too Large\0"
+    "Request-URI Too Long\0"
+    "Unsupported Media Type\0"
+    "Requested Range Not Satisfiable\0" "Expectation Failed\0";
+
+#define NUM_5XX_CODES   6
+static const char *Http5xxCodes[NUM_5XX_CODES];
+static const char *Http5xxStr =
+    "Internal Server Error\0"
+    "Not Implemented\0"
+    "Bad Gateway\0"
+    "Service Unavailable\0"
+    "Gateway Timeout\0" "HTTP Version Not Supported\0";
+
+static xboolean gInitialized = FALSE;
+
+/************************************************************************
+************************* Functions *************************************
+************************************************************************/
+
+/************************************************************************
+* Function: init_table													
+*																		
+* Parameters:															
+*	IN const char* encoded_str ; status code encoded string 			
+*	OUT const char *table[] ; table to store the encoded status code 
+*							  strings 
+*	IN int tbl_size ;	size of the table														
+*																		
+* Description: Initializing table representing an array of string		
+*	pointers with the individual strings that are comprised in the		
+*	input const char* encoded_str parameter.							
+*																		
+* Returns:																
+*	 void																
+************************************************************************/
+static XINLINE void
+init_table( IN const char *encoded_str,
+            OUT const char *table[],
+            IN int tbl_size )
+{
+    int i;
+    const char *s = encoded_str;
+
+    for( i = 0; i < tbl_size; i++ ) {
+        table[i] = s;
+        s += strlen( s ) + 1;   // next entry
+    }
+}
+
+/************************************************************************
+* Function: init_tables													
+*																		
+* Parameters:															
+*	none																
+*																		
+* Description: Initializing tables with HTTP strings and different HTTP 
+* codes.																
+*																		
+* Returns:																
+*	 void																
+************************************************************************/
+static XINLINE void
+init_tables( void )
+{
+    init_table( Http1xxStr, Http1xxCodes, NUM_1XX_CODES );
+    init_table( Http2xxStr, Http2xxCodes, NUM_2XX_CODES );
+    init_table( Http3xxStr, Http3xxCodes, NUM_3XX_CODES );
+    init_table( Http4xxStr, Http4xxCodes, NUM_4XX_CODES );
+    init_table( Http5xxStr, Http5xxCodes, NUM_5XX_CODES );
+
+    gInitialized = TRUE;        // mark only after complete
+}
+
+/************************************************************************
+* Function: http_get_code_text											
+*																		
+* Parameters:															
+*	int statusCode ; Status code based on which the status table and 
+*					status message is returned 							
+*																		
+* Description: Return the right status message based on the passed in	
+*	int statusCode input parameter										
+*																		
+* Returns:																
+*	 const char* ptr - pointer to the status message string				
+************************************************************************/
+const char *
+http_get_code_text( int statusCode )
+{
+    int index;
+    int table_num;
+
+    if( !gInitialized ) {
+        init_tables(  );
+    }
+
+    if( statusCode < 100 && statusCode >= 600 ) {
+        return NULL;
+    }
+
+    index = statusCode % 100;
+    table_num = statusCode / 100;
+
+    if( table_num == 1 && index < NUM_1XX_CODES ) {
+        return Http1xxCodes[index];
+    }
+
+    if( table_num == 2 && index < NUM_2XX_CODES ) {
+        return Http2xxCodes[index];
+    }
+
+    if( table_num == 3 && index < NUM_3XX_CODES ) {
+        return Http3xxCodes[index];
+    }
+
+    if( table_num == 4 && index < NUM_4XX_CODES ) {
+        return Http4xxCodes[index];
+    }
+
+    if( table_num == 5 && index < NUM_5XX_CODES ) {
+        return Http5xxCodes[index];
+    }
+
+    return NULL;
+}