projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major audio format handler cleanups.
[paraslash.git]
/
server.h
diff --git
a/server.h
b/server.h
index c1e670adcf3f237799dca8f85891a92bb48c3e1c..cf17c0ef06c362bb046f9ae538dc44f297497222 100644
(file)
--- a/
server.h
+++ b/
server.h
@@
-1,15
+1,17
@@
/*
/*
- * Copyright (C) 1997-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file server.h Common server data structures. */
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file server.h Common server data structures. */
-
/** Size of the selector_info and audio_file info strings of struct misc_meta_data. */
#define MMD_INFO_SIZE 16384
/** 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
+
/**
* Defines one command of para_server.
*/
/**
* Defines one command of para_server.
*/
@@
-35,11
+37,17
@@
struct sender_command_data{
/** The number of the sender in question. */
int sender_num;
/** Used for the allow/deny/add/remove subcommands. */
/** The number of the sender in question. */
int sender_num;
/** Used for the allow/deny/add/remove subcommands. */
-
struct in_addr addr
;
+
char host[MAX_HOSTLEN]
;
/** Used for allow/deny. */
int netmask;
/** The port number for add/remove. */
int port;
/** Used for allow/deny. */
int netmask;
/** The port number for add/remove. */
int port;
+ /** Maximal slice size. */
+ uint16_t max_slice_bytes;
+ /** Number of data slices plus redundant slices. */
+ uint8_t slices_per_group;
+ /** Number of slices minus number of redundant slices. */
+ uint8_t data_slices_per_group;
};
/**
};
/**
@@
-92,8
+100,8
@@
struct misc_meta_data {
unsigned int num_connects;
/** The number of connections currently active. */
unsigned int active_connections;
unsigned int num_connects;
/** The number of connections currently active. */
unsigned int active_connections;
- /** The process id of
para_serve
r. */
- pid_t
server
_pid;
+ /** The process id of
the audio file selecto
r. */
+ pid_t
afs
_pid;
/** This gets updated by afs and contains its current mode. */
char afs_mode_string[MAXLINE];
/** Used by the sender command. */
/** This gets updated by afs and contains its current mode. */
char afs_mode_string[MAXLINE];
/** Used by the sender command. */
@@
-106,5
+114,4
@@
struct misc_meta_data {
extern struct server_args_info conf;
__noreturn void handle_connect(int fd, const char *peername);
extern struct server_args_info conf;
__noreturn void handle_connect(int fd, const char *peername);
-void mmd_unlock(void);
-void mmd_lock(void);
+void parse_config_or_die(int override);