X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=e4e9a53dd96c740e2178b9d439cf8ed6e790ffb3;hp=4022bec7a90019084f7e326d99f236735788f9d3;hb=ddd7cd853044105f329a2c70cce2d8f1470f559e;hpb=f645b538c8f3dd88ce9a9ad5dbeb6cf341ad74ab

diff --git a/para.h b/para.h
index 4022bec7..e4e9a53d 100644
--- a/para.h
+++ b/para.h
@@ -50,61 +50,63 @@
 	_x > 0? _x : -_x; })
 
 /** Debug loglevel, gets really noisy. */
-#define LL_DEBUG 1
+#define LL_DEBUG 0
 /** Still noisy, but won't fill your disk. */
-#define LL_INFO  2
+#define LL_INFO  1
 /** Normal, but significant event. */
-#define LL_NOTICE 3
+#define LL_NOTICE 2
 /** Unexpected event that can be handled. */
-#define LL_WARNING 4
+#define LL_WARNING 3
 /** Unhandled error condition. */
-#define LL_ERROR 5
+#define LL_ERROR 4
 /** System might be unreliable. */
-#define LL_CRIT 6
+#define LL_CRIT 5
 /** Last message before exit. */
-#define LL_EMERG 7
+#define LL_EMERG 6
+/** Number of all loglevels. */
+#define NUM_LOGLEVELS 7
 
 /** Log messages with lower priority than that will not be compiled in. */
 #define COMPILE_TIME_LOGLEVEL 0
 
 /** \cond */
-#if LL_DEBUG > COMPILE_TIME_LOGLEVEL
+#if LL_DEBUG >= COMPILE_TIME_LOGLEVEL
 #define PARA_DEBUG_LOG(f,...) para_log(LL_DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
 #define PARA_DEBUG_LOG(...) do {;} while (0)
 #endif
 
-#if LL_INFO > COMPILE_TIME_LOGLEVEL
+#if LL_INFO >= COMPILE_TIME_LOGLEVEL
 #define PARA_INFO_LOG(f,...) para_log(LL_INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
 #define PARA_INFO_LOG(...) do {;} while (0)
 #endif
 
-#if LL_NOTICE > COMPILE_TIME_LOGLEVEL
+#if LL_NOTICE >= COMPILE_TIME_LOGLEVEL
 #define PARA_NOTICE_LOG(f,...) para_log(LL_NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
 #define PARA_NOTICE_LOG(...) do {;} while (0)
 #endif
 
-#if LL_WARNING > COMPILE_TIME_LOGLEVEL
+#if LL_WARNING >= COMPILE_TIME_LOGLEVEL
 #define PARA_WARNING_LOG(f,...) para_log(LL_WARNING, "%s: " f, __FUNCTION__, ##  __VA_ARGS__)
 #else
 #define PARA_WARNING_LOG(...) do {;} while (0)
 #endif
 
-#if LL_ERROR > COMPILE_TIME_LOGLEVEL
+#if LL_ERROR >= COMPILE_TIME_LOGLEVEL
 #define PARA_ERROR_LOG(f,...) para_log(LL_ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
 #define PARA_ERROR_LOG(...) do {;} while (0)
 #endif
 
-#if LL_CRIT > COMPILE_TIME_LOGLEVEL
+#if LL_CRIT >= COMPILE_TIME_LOGLEVEL
 #define PARA_CRIT_LOG(f,...) para_log(LL_CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
 #define PARA_CRIT_LOG(...) do {;} while (0)
 #endif
 
-#if LL_EMERG > COMPILE_TIME_LOGLEVEL
+#if LL_EMERG >= COMPILE_TIME_LOGLEVEL
 #define PARA_EMERG_LOG(f,...) para_log(LL_EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
 #define PARA_EMERG_LOG(...)
@@ -181,7 +183,7 @@ extern const char *status_item_list[];
 int stat_item_valid(const char *item);
 int stat_line_valid(const char *);
 void stat_client_write(const char *msg, int itemnum);
-int stat_client_add(int fd, long unsigned mask);
+int stat_client_add(int fd, uint64_t mask);
 
 __printf_2_3 void para_log(int, const char*, ...);
 
@@ -228,7 +230,8 @@ static inline long int para_random(unsigned max)
 }
 
 /** Round up x to a multiple of y */
-#define ROUND_UP(x, y) (((x) + ((y) - 1) / (y)) * (y))
+#define ROUND_UP(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+
 
 /** Get the size of an array */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -247,3 +250,8 @@ static inline long int para_random(unsigned max)
  * horribly for characters which have their most significant bit set.
  */
 #define para_isspace(c) isspace((int)(unsigned char)(c))
+
+/** Data that indicates an eof-condition for a fec-encoded stream. */
+#define FEC_EOF_PACKET "\xec\x0d\xcc\xfe\0\0\0\0" \
+	"\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0"
+#define FEC_EOF_PACKET_LEN 32