Ignore:
Timestamp:
May 1, 2010, 4:21:41 AM (11 years ago)
Author:
charles
Message:

(1.9x third-party) upgrade our miniupnp snapshot for #3125 "UPnP fails on Linksys AM300 modem/router"

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.9x/third-party/miniupnp/igd_desc_parse.h

    r5743 r10578  
    1 /* $Id: igd_desc_parse.h,v 1.6 2008/04/23 11:51:07 nanard Exp $ */
     1/* $Id: igd_desc_parse.h,v 1.7 2010/04/05 20:36:59 nanard Exp $ */
    22/* Project : miniupnp
    33 * http://miniupnp.free.fr/
    44 * Author : Thomas Bernard
    5  * Copyright (c) 2005-2008 Thomas Bernard
     5 * Copyright (c) 2005-2010 Thomas Bernard
    66 * This software is subject to the conditions detailed in the
    77 * LICENCE file provided in this distribution.
     
    1313 * descriptions of Internet Gateway Devices */
    1414#define MINIUPNPC_URL_MAXSIZE (128)
     15struct IGDdatas_service {
     16        char controlurl[MINIUPNPC_URL_MAXSIZE];
     17        char eventsuburl[MINIUPNPC_URL_MAXSIZE];
     18        char scpdurl[MINIUPNPC_URL_MAXSIZE];
     19        char servicetype[MINIUPNPC_URL_MAXSIZE];
     20        /*char devicetype[MINIUPNPC_URL_MAXSIZE];*/
     21};
     22
    1523struct IGDdatas {
    1624        char cureltname[MINIUPNPC_URL_MAXSIZE];
     
    1927        /*int state;*/
    2028        /* "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1" */
    21         char controlurl_CIF[MINIUPNPC_URL_MAXSIZE];
    22         char eventsuburl_CIF[MINIUPNPC_URL_MAXSIZE];
    23         char scpdurl_CIF[MINIUPNPC_URL_MAXSIZE];
    24         char servicetype_CIF[MINIUPNPC_URL_MAXSIZE];
    25         /*char devicetype_CIF[MINIUPNPC_URL_MAXSIZE];*/
     29        struct IGDdatas_service CIF;
    2630        /* "urn:schemas-upnp-org:service:WANIPConnection:1"
    2731         * "urn:schemas-upnp-org:service:WANPPPConnection:1" */
    28         char controlurl[MINIUPNPC_URL_MAXSIZE];
    29         char eventsuburl[MINIUPNPC_URL_MAXSIZE];
    30         char scpdurl[MINIUPNPC_URL_MAXSIZE];
    31         char servicetype[MINIUPNPC_URL_MAXSIZE];
    32         /*char devicetype[MINIUPNPC_URL_MAXSIZE];*/
     32        struct IGDdatas_service first;
     33        /* if both WANIPConnection and WANPPPConnection are present */
     34        struct IGDdatas_service second;
    3335        /* tmp */
    34         char controlurl_tmp[MINIUPNPC_URL_MAXSIZE];
    35         char eventsuburl_tmp[MINIUPNPC_URL_MAXSIZE];
    36         char scpdurl_tmp[MINIUPNPC_URL_MAXSIZE];
    37         char servicetype_tmp[MINIUPNPC_URL_MAXSIZE];
    38         /*char devicetype_tmp[MINIUPNPC_URL_MAXSIZE];*/
     36        struct IGDdatas_service tmp;
    3937};
    4038
Note: See TracChangeset for help on using the changeset viewer.