X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=66cf9e48d2fa7fb5e5df56ece15ef30df89427a2;hp=7cdc5e078b360fbb9730e9e5f79b9306c2f6d9fb;hb=ec354cf583bc2838ecfac64c428d3f992681c5fc;hpb=ac153fd54a0f093581ee863984070a325d5343b8;ds=sidebyside

diff --git a/para.h b/para.h
index 7cdc5e07..66cf9e48 100644
--- a/para.h
+++ b/para.h
@@ -145,16 +145,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);
@@ -181,9 +182,11 @@ 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);
-int stat_line_valid(const char *);
-void stat_client_write(const char *msg, int itemnum);
-int stat_client_add(int fd, long unsigned mask);
+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*, ...);
 
@@ -224,7 +227,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)));
 }