[BACK]Return to rpl.h CVS log [TXT] [DIR] Up to [local] / rpl / src

Diff for /rpl/src/rpl.h between versions 1.336 and 1.344

version 1.336, 2019/11/06 17:31:47 version 1.344, 2022/06/15 06:45:44
Line 1 Line 1
 /*  /*
 ================================================================================  ================================================================================
   RPL/2 (R) version 4.1.32    RPL/2 (R) version 4.1.33
   Copyright (C) 1989-2019 Dr. BERTRAND Joël    Copyright (C) 1989-2021 Dr. BERTRAND Joël
   
   This file is part of RPL/2.    This file is part of RPL/2.
   
Line 186 Line 186
 #   include "zlib.h"  #   include "zlib.h"
   
 #   include "openssl/evp.h"  #   include "openssl/evp.h"
 #   ifndef OPENSSL_NO_MD2  #   ifndef RPLCXX
 #       include "openssl/md2.h"  #       ifndef OPENSSL_NO_MD2
 #   endif  #           include "openssl/md2.h"
 #   ifndef OPENSSL_NO_MD4  #       endif
 #       include "openssl/md4.h"  #       ifndef OPENSSL_NO_MD4
 #   endif  #           include "openssl/md4.h"
 #   ifndef OPENSSL_NO_MD5  #       endif
 #       include "openssl/md5.h"  #       ifndef OPENSSL_NO_MD5
 #   endif  #           include "openssl/md5.h"
 #   ifndef OPENSSL_NO_MDC2  #       endif
 #       include "openssl/mdc2.h"  #       ifndef OPENSSL_NO_MDC2
 #   endif  #           include "openssl/mdc2.h"
 #   ifndef OPENSSL_NO_RIPEMD  #       endif
 #       include "openssl/ripemd.h"  #       ifndef OPENSSL_NO_RIPEMD
 #   endif  #           include "openssl/ripemd.h"
 #   ifndef OPENSSL_NO_SHA  #       endif
 #       include "openssl/sha.h"  #       ifndef OPENSSL_NO_SHA
 #   endif  #           include "openssl/sha.h"
 #   ifndef OPENSSL_NO_WHIRLPOOL  #       endif
 #       include "openssl/whrlpool.h"  #       ifndef OPENSSL_NO_WHIRLPOOL
 #   endif  #           include "openssl/whrlpool.h"
 #   ifndef OPENSSL_NO_AES  #       endif
 #       include "openssl/aes.h"  #       ifndef OPENSSL_NO_AES
 #   endif  #           include "openssl/aes.h"
 #   ifndef OPENSSL_NO_CAMELLIA  #       endif
 #       include "openssl/camellia.h"  #       ifndef OPENSSL_NO_CAMELLIA
 #   endif  #           include "openssl/camellia.h"
 #   ifndef OPENSSL_NO_RC2  #       endif
 #       include "openssl/rc2.h"  #       ifndef OPENSSL_NO_RC2
 #   endif  #           include "openssl/rc2.h"
 #   ifndef OPENSSL_NO_IDEA  #       endif
 #       include "openssl/idea.h"  #       ifndef OPENSSL_NO_IDEA
   #           include "openssl/idea.h"
   #       endif
 #   endif  #   endif
   
 #   include "sqlite3.h"  #   include "sqlite3.h"
Line 269 Line 271
   
 #ifndef RPLARGS  #ifndef RPLARGS
 #   ifndef UNIX_PATH_MAX  #   ifndef UNIX_PATH_MAX
         struct sockaddr_un sizecheck;  #       pragma GCC diagnostic push
   #       pragma GCC diagnostic ignored "-Wunused-variable"
           static struct sockaddr_un sizecheck;
 #       define UNIX_PATH_MAX sizeof(sizecheck.sun_path)  #       define UNIX_PATH_MAX sizeof(sizecheck.sun_path)
   #       pragma GCC diagnostic pop
 #   endif  #   endif
 #endif  #endif
   
Line 731  void *debug_memoire_modification(void *p Line 736  void *debug_memoire_modification(void *p
 void debug_memoire_retrait(void *ptr);  void debug_memoire_retrait(void *ptr);
 void debug_memoire_verification();  void debug_memoire_verification();
   
 pid_t debug_fork();  
   
 #define malloc(s) debug_memoire_ajout(s, __FUNCTION__, __LINE__, #s)  
 #define free(s) debug_memoire_retrait(s)  #define free(s) debug_memoire_retrait(s)
 #define realloc(s, t) debug_memoire_modification(s, t, \  #ifdef RPLCXX
             __FUNCTION__, __LINE__, #t)  #   define malloc(s) debug_memoire_ajout(s, \
 #define fork() debug_fork()                  const_cast<const unsigned char *> \
                   (reinterpret_cast<unsigned char *> \
                   (const_cast<char *>(__FUNCTION__))), __LINE__, \
                   const_cast<const unsigned char *> \
                   (reinterpret_cast<unsigned char *> \
                   (const_cast<char *>(#s))))
   #   define realloc(s, t) debug_memoire_modification(s, t, \
                   const_cast<const unsigned char *> \
                   (reinterpret_cast<unsigned char *> \
                   (const_cast<char *>(__FUNCTION__))), __LINE__, \
                   const_cast<const unsigned char *> \
                   (reinterpret_cast<unsigned char *> \
                   (const_cast<char *>(#t))))
   #else
   #   define malloc(s) debug_memoire_ajout(s, __FUNCTION__, __LINE__, \
                   (const unsigned char *) #s)
   #   define realloc(s, t) debug_memoire_modification(s, t, \
                   __FUNCTION__, __LINE__, (const unsigned char *) #t)
   #endif
   #define fork() debug_fork(s_etat_processus)
 #endif  #endif
   
 #ifdef DEBUG_RETURN  #ifdef DEBUG_RETURN
Line 1115  pid_t debug_fork(); Line 1136  pid_t debug_fork();
 #define VIN __RPL_VIN  #define VIN __RPL_VIN
 #define VRL __RPL_VRL  #define VRL __RPL_VRL
   
 enum t_rplcas_commandes     { RPLCAS_INTEGRATION = 0, RPLCAS_LIMITE };  enum t_rplcas_commandes     { RPLCAS_INTEGRATION = 0, RPLCAS_LIMITE,
                               RPLCAS_SIMPLIFICATION };
   
 enum t_type     { ADR = 0, ALG, BIN, CHN, CPL, EXT, FCH, FCT, INT, LST,  enum t_type     { ADR = 0, ALG, BIN, CHN, CPL, EXT, FCH, FCT, INT, LST,
                 MCX, MIN, MRL, MTX, NOM, NON, PRC, REC, REL, RPN, SCK,                  MCX, MIN, MRL, MTX, NOM, NON, PRC, REC, REL, RPN, SCK,
Line 2557  typedef struct processus Line 2579  typedef struct processus
 } struct_processus;  } struct_processus;
 #endif  #endif
   
   #ifdef DEBUG_MEMOIRE
   pid_t debug_fork(struct_processus *s_etat_processus);
   #endif
   
   
 /*  /*
 ================================================================================  ================================================================================
Removed from v.1.336  
changed lines
  Added in v.1.344

CVSweb interface <joel.bertrand@systella.fr>