Ignore:
Timestamp:
Jul 26, 2011, 1:36:30 AM (10 years ago)
Author:
livings124
Message:

#4387 Update miniupnpc to 1.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/third-party/miniupnp/miniupnpc.h

    r9282 r12593  
    1 /* $Id: miniupnpc.h,v 1.19 2009/10/10 19:15:35 nanard Exp $ */
     1/* $Id: miniupnpc.h,v 1.23 2011/04/11 08:21:46 nanard Exp $ */
    22/* Project: miniupnp
    33 * http://miniupnp.free.fr/
    44 * Author: Thomas Bernard
    5  * Copyright (c) 2005-2006 Thomas Bernard
     5 * Copyright (c) 2005-2011 Thomas Bernard
    66 * This software is subjects to the conditions detailed
    77 * in the LICENCE file provided within this distribution */
     
    1212#include "igd_desc_parse.h"
    1313
     14/* error codes : */
     15#define UPNPDISCOVER_SUCCESS (0)
     16#define UPNPDISCOVER_UNKNOWN_ERROR (-1)
     17#define UPNPDISCOVER_SOCKET_ERROR (-101)
     18#define UPNPDISCOVER_MEMORY_ERROR (-102)
     19
    1420#ifdef __cplusplus
    1521extern "C" {
     
    1925struct UPNParg { const char * elt; const char * val; };
    2026
    21 int simpleUPnPcommand(int, const char *, const char *,
    22                       const char *, struct UPNParg *,
    23                       char *, int *);
     27char *
     28simpleUPnPcommand(int, const char *, const char *,
     29                  const char *, struct UPNParg *,
     30                  int *);
    2431
    2532struct UPNPDev {
     
    4350 * If sameport is not null, SSDP packets will be sent from the source port
    4451 * 1900 (same as destination port) otherwise system assign a source port. */
    45 LIBSPEC struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
    46                                       const char * minissdpdsock, int sameport);
     52LIBSPEC struct UPNPDev *
     53upnpDiscover(int delay, const char * multicastif,
     54             const char * minissdpdsock, int sameport,
     55             int ipv6,
     56             int * error);
    4757/* freeUPNPDevlist()
    4858 * free list returned by upnpDiscover() */
     
    5868 * ipcondescURL: url of the description of the WANIPConnection
    5969 * controlURL_CIF: controlURL of the WANCommonInterfaceConfig
     70 * controlURL_6FC: controlURL of the WANIPv6FirewallControl
    6071 */
    6172struct UPNPUrls {
     
    6374        char * ipcondescURL;
    6475        char * controlURL_CIF;
     76        char * controlURL_6FC;
    6577};
    6678
     
    98110LIBSPEC void FreeUPNPUrls(struct UPNPUrls *);
    99111
    100 /* Reads data from the specified socket.
    101  * Returns the number of bytes read if successful, zero if no bytes were
    102  * read or if we timed out. Returns negative if there was an error. */
    103 int ReceiveData(int socket, char * data, int length, int timeout);
    104 
    105112/* return 0 or 1 */
    106113LIBSPEC int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
Note: See TracChangeset for help on using the changeset viewer.