X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=09132432bfb56c8cb8aaa0577a87437e82151981;hp=995bfb9d396d089d7d163f794c4c91ff3e61f614;hb=d5538ff0dd9f6531a1a319b49c32bd72597fb2c3;hpb=337d7784b0f8bc30b1fa9af56ace503acd97d40d

diff --git a/para.h b/para.h
index 995bfb9d..09132432 100644
--- a/para.h
+++ b/para.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -131,9 +131,10 @@
 		va_end(argp); \
 	}
 
-/** version text used by various commands if -V switch was given */
-#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION " (" CODENAME ")" "\n" \
-	"Copyright (C) 2009 Andre Noll\n" \
+/** Version text used by various commands if -V switch was given. */
+#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION \
+	" (" GIT_VERSION ": " CODENAME ")" "\n" \
+	"Copyright (C) 2010 Andre Noll\n" \
 	"This is free software with ABSOLUTELY NO WARRANTY." \
 	" See COPYING for details.\n" \
 	"Written by Andre Noll.\n" \
@@ -145,16 +146,17 @@
 		printf("%s", VERSION_TEXT(_prefix)); \
 		exit(EXIT_SUCCESS); \
 	}
+
+/* Sent by para_client to initiate the authentication procedure. */
+#define AUTH_REQUEST_MSG "auth rsa "
 /** sent by para_server for commands that expect a data file */
 #define AWAITING_DATA_MSG "\nAwaiting Data."
 /** sent by para_server if authentication was successful */
-#define PROCEED_MSG "\nProceed.\n"
+#define PROCEED_MSG "Proceed."
 /** length of the \p PROCEED_MSG string */
 #define PROCEED_MSG_LEN strlen(PROCEED_MSG)
 /** sent by para_client to indicate the end of the command line */
 #define EOC_MSG "\nEnd of Command."
-/** sent by para_client, followed by the decrypted challenge number */
-#define CHALLENGE_RESPONSE_MSG "challenge_response:"
 
 /* exec */
 int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);
@@ -180,12 +182,8 @@ enum status_items {STATUS_ITEM_ENUM NUM_STAT_ITEMS};
 extern const char *status_item_list[];
 /** Loop over each status item. */
 #define FOR_EACH_STATUS_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
-int stat_item_valid(const char *item);
-void stat_client_write_item(int item_num);
-int stat_client_add(int fd, uint64_t mask, int parser_friendly);
 int for_each_stat_item(char *item_buf, size_t num_bytes,
 	int (*item_handler)(int, char *));
-void clear_and_dump_items(void);
 
 __printf_2_3 void para_log(int, const char*, ...);
 
@@ -226,7 +224,7 @@ __printf_2_3 void para_log(int, const char*, ...);
  *
  * \return An integer between zero and \p max - 1, inclusively.
  */
-static inline long int para_random(unsigned max)
+_static_inline_ long int para_random(unsigned max)
 {
 	return ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
 }
@@ -257,3 +255,31 @@ static inline long int para_random(unsigned max)
 #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
+
+/** Used to avoid a shortcoming in vim's syntax highlighting. */
+#define EMBRACE(...) { __VA_ARGS__}
+
+/**
+ * The sample formats supported by paraslash.
+ *
+ * It may be determined by one of the following sources:
+ *
+ *	1. The decoding filter (para_audiod only). In this case, it is always
+ *	\p SF_S16_LE which is the canonical format used within decoders.
+ *
+ *	2. The wav header (para_write only).
+ *
+ *	3. The --format option of para_write.
+ */
+#define SAMPLE_FORMATS \
+	SAMPLE_FORMAT(SF_S8, "8 bit signed"), \
+	SAMPLE_FORMAT(SF_U8, "8 bit unsigned"), \
+	SAMPLE_FORMAT(SF_S16_LE, "16 bit signed, little endian"), \
+	SAMPLE_FORMAT(SF_S16_BE, "16 bit signed, big endian"), \
+	SAMPLE_FORMAT(SF_U16_LE, "16 bit unsigned, little endian"), \
+	SAMPLE_FORMAT(SF_U16_BE, "16 bit unsigned, big endian"), \
+
+#define SAMPLE_FORMAT(a, b) a
+enum sample_format {SAMPLE_FORMATS};
+#undef SAMPLE_FORMAT
+#define SAMPLE_FORMAT(a, b) b