X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.h;h=da75d86bdf191b130d02da12f49172ac5e0482d7;hp=079ff5a01cb8c70740aea1012df64014de56cf31;hb=HEAD;hpb=d31995b3074bb19aa4da66ce5c4774ca9ed101a1

diff --git a/server.h b/server.h
index 079ff5a0..10bb6172 100644
--- a/server.h
+++ b/server.h
@@ -5,10 +5,6 @@
 /** Size of the selector_info and audio_file info strings of struct misc_meta_data. */
 #define MMD_INFO_SIZE 16384
 
-/** The maximum length of the host component in an URL */
-#define MAX_HOSTLEN 256
-
-
 /** Arguments for the sender command. */
 struct sender_command_data {
 	/** Greater than zero indicates that a sender cmd is already queued. */
@@ -73,27 +69,19 @@ struct misc_meta_data {
 	unsigned int num_connects;
 	/** The number of connections currently active. */
 	unsigned int active_connections;
-	/** The process id of the audio file selector. */
-	pid_t afs_pid;
 	/** This gets updated by afs and contains its current mode. */
 	char afs_mode_string[MAXLINE];
 	/** Used by the sender command. */
 	struct sender_command_data sender_cmd_data;
+	/** Set by the ll command. */
+	int loglevel;
 	/** Describes the current audio file. */
 	struct audio_file_data afd;
 };
 
+extern pid_t afs_pid;
 extern struct lls_parse_result *server_lpr;
 
-/**
- * Get a reference to the supercommand of para_server.
- *
- * This is needed for parsing the command line and for the ENUM_STRING_VAL()
- * macro below. The latter macro is used in command.c, so CMD_PTR() can not
- * be made local to server.c.
- */
-#define CMD_PTR (lls_cmd(0, server_suite))
-
 /** Get the parse result of an option to para_server. */
 #define OPT_RESULT(_name) (lls_opt_result( \
 		LSG_SERVER_PARA_SERVER_OPT_ ## _name, server_lpr))
@@ -110,10 +98,8 @@ extern struct lls_parse_result *server_lpr;
 /** The (first) argument to a server option of type int32. */
 #define OPT_INT32_VAL(_name) (lls_int32_val(0, OPT_RESULT(_name)))
 
-/** Get the string which corresponds to an enum constant. */
-#define ENUM_STRING_VAL(_name) (lls_enum_string_val(OPT_UINT32_VAL(_name), \
-	lls_opt(LSG_SERVER_PARA_SERVER_OPT_ ## _name, CMD_PTR)))
-
-__noreturn void handle_connect(int fd, const char *peername);
+int handle_connect(int fd);
 void parse_config_or_die(bool reload);
 char *server_get_tasks(void);
+bool process_is_command_handler(void);
+void free_lpr(void);