Diff for /embedaddon/miniupnpd/upnpdescgen.h between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2012/02/21 23:16:02 version 1.1.1.3, 2013/07/22 00:32:35
Line 1 Line 1
 /* $Id$ */  /* $Id$ */
 /* MiniUPnP project  /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/   * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 * (c) 2006-2008 Thomas Bernard  * (c) 2006-2011 Thomas Bernard
  * This software is subject to the conditions detailed   * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */   * in the LICENCE file provided within the distribution */
   
#ifndef __UPNPDESCGEN_H__#ifndef UPNPDESCGEN_H_INCLUDED
#define __UPNPDESCGEN_H__#define UPNPDESCGEN_H_INCLUDED
   
 #include "config.h"  #include "config.h"
   
/* for the root description /* for the root description
  * The child list reference is stored in "data" member using the   * The child list reference is stored in "data" member using the
  * INITHELPER macro with index/nchild always in the   * INITHELPER macro with index/nchild always in the
  * same order, whatever the endianness */   * same order, whatever the endianness */
Line 31  struct action { Line 31  struct action {
 };  };
   
 struct argument {       /* the name of the arg is obtained from the variable */  struct argument {       /* the name of the arg is obtained from the variable */
        unsigned char dir;              /* 1 = in, 2 = out */        unsigned char dir;              /* MSB : don't append "New" Flag,
                                  * 5 Medium bits : magic argument name index
                                  * 2 LSB : 1 = in, 2 = out */
         unsigned char relatedVar;       /* index of the related variable */          unsigned char relatedVar;       /* index of the related variable */
 };  };
   
Line 39  struct stateVar { Line 41  struct stateVar {
         const char * name;          const char * name;
         unsigned char itype;    /* MSB: sendEvent flag, 7 LSB: index in upnptypes */          unsigned char itype;    /* MSB: sendEvent flag, 7 LSB: index in upnptypes */
         unsigned char idefault; /* default value */          unsigned char idefault; /* default value */
        unsigned char iallowedlist;     /* index in allowed values list */        unsigned char iallowedlist;     /* index in allowed values list
                                      * or in allowed range list */
         unsigned char ieventvalue;      /* fixed value returned or magical values */          unsigned char ieventvalue;      /* fixed value returned or magical values */
 };  };
   
/* little endian /* little endian
  * The code has now be tested on big endian architecture */   * The code has now be tested on big endian architecture */
#define INITHELPER(i, n) ((char *)((n<<16)|i))#define INITHELPER(i, n) ((char *)(((n)<<16)|(i)))
   
 /* char * genRootDesc(int *);  /* char * genRootDesc(int *);
  * returns: NULL on error, string allocated on the heap */   * returns: NULL on error, string allocated on the heap */
Line 64  char * Line 67  char *
 genL3F(int * len);  genL3F(int * len);
 #endif  #endif
   
   #ifdef ENABLE_6FC_SERVICE
   char *
   gen6FC(int * len);
   #endif
   
   #ifdef ENABLE_DP_SERVICE
   char *
   genDP(int * len);
   #endif
   
 #ifdef ENABLE_EVENTS  #ifdef ENABLE_EVENTS
 char *  char *
 getVarsWANIPCn(int * len);  getVarsWANIPCn(int * len);
Line 71  getVarsWANIPCn(int * len); Line 84  getVarsWANIPCn(int * len);
 char *  char *
 getVarsWANCfg(int * len);  getVarsWANCfg(int * len);
   
   #ifdef ENABLE_L3F_SERVICE
 char *  char *
 getVarsL3F(int * len);  getVarsL3F(int * len);
 #endif  #endif
   #ifdef ENABLE_6FC_SERVICE
   char *
   getVars6FC(int * len);
   #endif
   #ifdef ENABLE_DP_SERVICE
   char *
   getVarsDP(int * len);
   #endif
   #endif /* ENABLE_EVENTS */
   
 #endif  #endif
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>