X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.h;h=ae3a7dd878cab895a698d91f6daf84e9e9815b54;hp=1e4a75f83e514c5a5537a5850c4bdca5888f3323;hb=c2eecbd1d8445b6605f0d07aea0ed9a66499e5dd;hpb=3e514007f72825597eaf68ff33339a8eb0ad420b

diff --git a/server.h b/server.h
index 1e4a75f8..ae3a7dd8 100644
--- a/server.h
+++ b/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -19,49 +19,27 @@
 /** \file server.h common server data structures */
 
 #include "para.h"
+#include "afh.h"
 
-
-/** size of the dbinfo and audio_file info strings of struct misc_meta_data */
+/** size of the selector_info and audio_file info strings of struct misc_meta_data */
 #define MMD_INFO_SIZE 16384
 
-/**
- * permission flags that can be set individually for any server command
- *
- * - DB_READ: command reads from the database
- * - DB_WRITE: command changes the contents of the database
- * - AFS_READ: command reads information about the current audio stream
- * - AFS_WRITE: command changes the current audio stream
- */
-enum {DB_READ = 1, DB_WRITE = 2, AFS_READ = 4, AFS_WRITE = 8};
-
-/**
- * data needed to authenticate the user
- */
-struct user{
-/** the username */
-	char name[MAXLINE];
-/** full path to the public RSA key */
-	char pubkey_file[_POSIX_PATH_MAX];
-/** the privileges of this user */
-	unsigned int perms;
-};
-
 /**
  * defines one command of para_server
  */
 struct server_command {
 /** the name of the command */
-	char *name;
+	const char *name;
 /** pointer to the function that handles the command */
 	int (*handler)(int, int, char **);
 /** the privileges a user must have to execute this command */
 	unsigned int perms;
 /** one-line description of the command */
-	char *description;
+	const char *description;
 /** summary of the command line options */
-	char *synopsis;
+	const char *usage;
 /** the long help text */
-	char *help;
+	const char *help;
 };
 
 /** holds the arguments for the para_server's sender command */
@@ -94,35 +72,31 @@ struct sender_command_data{
  *	- The contents are listed in the stat command and have to be up to
  *	date.
  */
-struct misc_meta_data{
+struct misc_meta_data {
+/** information on the current audio file  */
+	struct audio_format_info afi;
 /** the size of the current audio file in bytes */
-	long unsigned int size;
+	size_t size;
 /** the full path of the current audio file */
 	char filename[_POSIX_PATH_MAX];
 /** the last modification file of the current audio file */
 	time_t mtime;
-/* the number of the current audio format */
+/** the number of the current audio format */
 	int audio_format;
 /** the "old" status flags -- commands may only read them */
-	unsigned int afs_status_flags;
+	unsigned int vss_status_flags;
 /** the new status flags -- commands may set them **/
-	unsigned int new_afs_status_flags;
+	unsigned int new_vss_status_flags;
 /** the number of data chunks sent for the current audio file */
 	long unsigned chunks_sent;
-/** the number of chunks this audio file contains */
-	long unsigned chunks_total;
 /** set by the jmp/ff commands to the new position in chunks */
 	long unsigned repos_request;
 /** the number of the chunk currently sent out*/
 	long unsigned current_chunk;
 /** the milliseconds that have been skipped of the current audio file */
 	long offset;
-/** the length of the audio file in seconds */
-	int seconds_total;
 /** the time para_server started to stream */
 	struct timeval stream_start;
-/** a string that gets filled in by the audio format handler */
-	char audio_file_info[MMD_INFO_SIZE];
 /** the event counter
  *
  * commands may increase this to force a status update to be sent to all
@@ -140,15 +114,16 @@ struct misc_meta_data{
 /** the process id of para_server */
 	pid_t server_pid;
 /** a string that gets filled in by the current audio file selector */
-	char dbinfo[MMD_INFO_SIZE];
-/** the number if the current database tool */
-	int dbt_num;
-/** commands set this to non-zero to request a database tool change */
-	int dbt_change;
+	char selector_info[MMD_INFO_SIZE];
+/** the number if the current audio file selector */
+	int selector_num;
+/** commands set this to non-zero to change the current selector */
+	int selector_change;
 /** used by the sender command */
 	struct sender_command_data sender_cmd_data;
 };
 
+extern struct server_args_info conf;
 
 int handle_connect(int fd, struct sockaddr_in *addr);
 void mmd_unlock(void);