X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.h;h=8d1d6752daa8b558c4f5160a37e3d11155074832;hb=0f1d8e4e182a48d366f06633b797a5dfbbfea407;hp=84338e92aa5956560a5659ffc5dd073b1eccef17;hpb=d2e164526bed7f523043b7e4ec5bd282d5bc6f19;p=paraslash.git

diff --git a/server.h b/server.h
index 84338e92..8d1d6752 100644
--- a/server.h
+++ b/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -36,6 +36,8 @@ struct sender_command_data{
 	int sender_num;
 	/** Used for the allow/deny/add/remove subcommands. */
 	struct in_addr addr;
+	/** Used for the allow/deny/add/remove subcommands. */
+	char host[256];
 	/** Used for allow/deny. */
 	int netmask;
 	/** The port number for add/remove. */
@@ -92,8 +94,8 @@ struct misc_meta_data {
 	unsigned int num_connects;
 	/** The number of connections currently active. */
 	unsigned int active_connections;
-	/** The process id of para_server. */
-	pid_t server_pid;
+	/** 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. */
@@ -105,9 +107,5 @@ struct misc_meta_data {
 /** Command line options for para_server. */
 extern struct server_args_info conf;
 
-/** Socket for afs-server communication. */
-extern int afs_socket;
-
-int handle_connect(int fd, const char *peername);
-void mmd_unlock(void);
-void mmd_lock(void);
+__noreturn void handle_connect(int fd, const char *peername);
+void parse_config_or_die(int override);