server: Simplify afs socket cookie code.

[paraslash.git] / server.h

diff --git a/server.h b/server.h
index 0bfca305fc5b6465aec22db6b5b0c155a682a141..1852dd50962b78a72d270bb1d20e61eb0d9911c4 100644 (file)
--- a/server.h
+++ b/server.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file server.h Common server data structures. */
 
@@ -77,8 +73,6 @@ 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. */
@@ -87,6 +81,7 @@ struct misc_meta_data {
        struct audio_file_data afd;
 };
 
+extern pid_t afs_pid;
 extern struct lls_parse_result *server_lpr;
 
 /**
@@ -118,6 +113,6 @@ extern struct lls_parse_result *server_lpr;
 #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);
+__noreturn void handle_connect(int fd);
 void parse_config_or_die(bool reload);
 char *server_get_tasks(void);