Changeset 6967


Ignore:
Timestamp:
Oct 27, 2008, 4:08:28 PM (12 years ago)
Author:
charles
Message:

update to miniupnpc-1.2 and libnatpmp-20081009

Location:
trunk/third-party
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/third-party/libnatpmp/Makefile.am

    r6333 r6967  
    11noinst_LIBRARIES = libnatpmp.a
     2
     3AM_CPPFLAGS = -DENABLE_STRNATPMPERR
    24
    35libnatpmp_a_SOURCES = \

  • trunk/third-party/libnatpmp/README

    r6303 r6967  
    11libnatpmp is written by Thomas Bernard.
    22Its homepage is http://miniupnp.tuxfamily.org/libnatpmp.html
    3 This code is from the libnatpmp-20080707 snapshot
     3This code is from the libnatpmp-20081006 snapshot
    44

  • trunk/third-party/libnatpmp/declspec.h

    r6705 r6967  
    22#define __DECLSPEC_H__
    33
    4 /*
    54#if defined(WIN32) && !defined(STATICLIB)
    65        #ifdef NATPMP_EXPORTS
    … …  
    109        #endif
    1110#else
    12 */
    1311        #define LIBSPEC
    14 /*
    1512#endif
    16 */
    1713
    1814#endif

  • trunk/third-party/libnatpmp/getgateway.c

    r6706 r6967  
    1 /* $Id: getgateway.c,v 1.11 2008/07/02 23:56:11 nanard Exp $ */
     1/* $Id: getgateway.c,v 1.12 2008/10/06 10:04:16 nanard Exp $ */
    22/* libnatpmp
    33 * Copyright (c) 2007-2008, Thomas BERNARD <miniupnp@free.fr>
    … …  
    1818#ifndef WIN32
    1919#include <netinet/in.h>
    20 #else
    21 #include <winsock2.h>
    22 #include <ws2tcpip.h>
    2320#endif
    2421#include <sys/param.h>
    … …  
    150147                buf = malloc(l);
    151148                if(sysctl(mib, sizeof(mib)/sizeof(int), buf, &l, 0, 0) < 0) {
     149                        free(buf);
    152150                        return FAILED;
    153151                }

  • trunk/third-party/libnatpmp/natpmp.c

    r6706 r6967  
    1818#include <time.h>
    1919#include <sys/time.h>
    20 #include <errno.h>
    2120#ifdef WIN32
    2221#include <winsock2.h>
    23 #include <ws2tcpip.h>
     22#include <Ws2tcpip.h>
    2423#include <io.h>
    2524#define EWOULDBLOCK WSAEWOULDBLOCK
    … …  
    269268}
    270269
     270#ifdef ENABLE_STRNATPMPERR
    271271const char * strnatpmperr(int r)
    272272{
    … …  
    336336        return s;
    337337}
    338 
     338#endif
     339

  • trunk/third-party/libnatpmp/natpmp.h

    r6333 r6967  
    180180LIBSPEC int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response);
    181181
     182#ifdef ENABLE_STRNATPMPERR
    182183LIBSPEC const char * strnatpmperr(int t);
     184#endif
    183185
    184186#endif

  • trunk/third-party/miniupnp/README

    r6848 r6967  
    11MiniUPnP is written by Thomas Bernard.
    22Its homepage is http://miniupnp.free.fr/
    3 This is from the miniupnpc-20081002 snapshot
     3This is from the miniupnpc-1.2 tarball (7 Oct 2008)

  • trunk/third-party/miniupnp/minissdpc.c

    r6848 r6967  
    1 /* $Id: minissdpc.c,v 1.4 2007/12/19 14:56:58 nanard Exp $ */
     1/* $Id: minissdpc.c,v 1.6 2008/10/06 23:08:39 nanard Exp $ */
    22/* Project : miniupnp
    33 * Author : Thomas BERNARD
    4  * copyright (c) 2005-2007 Thomas Bernard
     4 * copyright (c) 2005-2008 Thomas Bernard
    55 * This software is subjet to the conditions detailed in the
    66 * provided LICENCE file. */
    … …  
    1717#include "miniupnpc.h"
    1818
    19 #define DECODELENGTH(n, p) n = 0; \
    20                            do { n = (n << 7) | (*p & 0x7f); } \
    21                            while(*(p++)&0x80);
    22 #define CODELENGTH(n, p) do { *p = (n & 0x7f) | ((n > 0x7f) ? 0x80 : 0); \
    23                               p++; n >>= 7; } while(n);
     19#include "codelength.h"
    2420
    2521struct UPNPDev *
    … …  
    5349        }
    5450        stsize = strlen(devtype);
    55         buffer[0] = 1;
     51        buffer[0] = 1; /* request type 1 : request devices/services by type */
    5652        p = buffer + 1;
    5753        l = stsize;     CODELENGTH(l, p);
Note: See TracChangeset for help on using the changeset viewer.