--- rpl/src/rpl.h 2015/01/28 11:45:44 1.260 +++ rpl/src/rpl.h 2015/09/18 13:41:21 1.276 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.1.20 + RPL/2 (R) version 4.1.23 Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -38,6 +38,10 @@ # ifdef OpenBSD # define _BSD_SOURCE # endif + +# ifdef FreeBSD +# define __BSD_VISIBLE 1 +# endif #endif #ifdef OS2 @@ -212,7 +216,6 @@ # undef HAVE_STACK_OVERFLOW_RECOVERY # endif -# define HAVE_INLINE # define GSL_RANGE_CHECK_OFF # include "gsl/gsl_cdf.h" # include "gsl/gsl_cblas.h" @@ -323,6 +326,7 @@ typedef struct queue_signaux volatile logical1 requete_arret; pthread_t thread_signaux; + pid_t controle; volatile struct { @@ -1309,6 +1313,20 @@ typedef struct connecteur_sql */ #ifndef RPLARGS + +# define d_BIND_TO_DEVICE 0 +# define d_BROADCAST 1 +# define d_DONT_ROUTE 2 +# define d_KEEP_ALIVE 3 +# define d_PRIORITY 4 +# define d_RECEIVE_BUFFER 5 +# define d_FORCE_RECEIVE_BUFFER 6 +# define d_SEND_BUFFER 7 +# define d_FORCE_SEND_BUFFER 8 +# define d_RECEIVING_TIMEOUT 9 +# define d_SENDING_TIMEOUT 10 +# define d_REUSE_ADDRESS 11 + typedef struct socket { int domaine; @@ -1327,6 +1345,13 @@ typedef struct socket unsigned char protection; unsigned char type[19 + 1]; + integer8 options; + int priorite; + int buffer_reception; + int buffer_emission; + int timeout_emission; + int timeout_reception; + struct_objet *format; } struct_socket; #endif @@ -2357,6 +2382,7 @@ typedef struct processus struct timeval horodatage_profilage; pthread_mutex_t mutex_allocation; + pthread_mutex_t mutex_allocation_buffer; pthread_mutex_t mutex_interruptions; pthread_mutex_t mutex_pile_processus; pthread_mutex_t mutex_signaux; @@ -2391,14 +2417,14 @@ typedef struct processus integer8 taille_pile_objets; struct_objet *pile_objets; -# define TAILLE_CACHE 1024 +# define TAILLE_CACHE 1024 # define CACHE(type, nom) \ type *objets_##nom[TAILLE_CACHE]; \ - int pointeur_##nom; + volatile int pointeur_##nom; # define CACHE2(type, nom) \ type *nom[TAILLE_CACHE]; \ - int pointeur_##nom; + volatile int pointeur_##nom; CACHE(integer8, adr) CACHE(logical8, bin)