4f31bd9340
This commit beefs up the Makefile to do the build, instead of the Rakefile. It also removes from the Rakefile the dependency on rake_utils, which should mean it's ok to build in a schroot. The files are reorganised to make the Makefile rules more tractable, although the reorganisation reveals a problem with our current code organisation. The problem is that the proxy-specific code transitively depends on the server code via flexnbd.h, which has a circular dependency on the server and client structs. This should be broken in a future commit by separating the flexnbd struct into a shared config struct and server-specific parts, so that the server code can be moved into src/server to more accurately show the functional dependencies.
67 lines
1.6 KiB
C
67 lines
1.6 KiB
C
#ifndef FLEXNBD_H
|
|
#define FLEXNBD_H
|
|
|
|
#include "acl.h"
|
|
#include "mirror.h"
|
|
#include "serve.h"
|
|
#include "proxy.h"
|
|
#include "client.h"
|
|
#include "self_pipe.h"
|
|
#include "mbox.h"
|
|
#include "control.h"
|
|
#include "flexthread.h"
|
|
|
|
/* Carries the "globals". */
|
|
struct flexnbd {
|
|
/* Our serve pointer should never be dereferenced outside a
|
|
* flexnbd_switch_lock/unlock pair.
|
|
*/
|
|
struct server * serve;
|
|
|
|
/* We only have a control object if a control socket name was
|
|
* passed on the command line.
|
|
*/
|
|
struct control * control;
|
|
|
|
/* File descriptor for a signalfd(2) signal stream. */
|
|
int signal_fd;
|
|
};
|
|
|
|
|
|
struct flexnbd * flexnbd_create(void);
|
|
struct flexnbd * flexnbd_create_serving(
|
|
char* s_ip_address,
|
|
char* s_port,
|
|
char* s_file,
|
|
char* s_ctrl_sock,
|
|
int default_deny,
|
|
int acl_entries,
|
|
char** s_acl_entries,
|
|
int max_nbd_clients,
|
|
int use_killswitch);
|
|
|
|
struct flexnbd * flexnbd_create_listening(
|
|
char* s_ip_address,
|
|
char* s_port,
|
|
char* s_file,
|
|
char* s_ctrl_sock,
|
|
int default_deny,
|
|
int acl_entries,
|
|
char** s_acl_entries );
|
|
|
|
void flexnbd_destroy( struct flexnbd * );
|
|
enum mirror_state;
|
|
enum mirror_state flexnbd_get_mirror_state( struct flexnbd * );
|
|
int flexnbd_default_deny( struct flexnbd * );
|
|
void flexnbd_set_server( struct flexnbd * flexnbd, struct server * serve );
|
|
int flexnbd_signal_fd( struct flexnbd * flexnbd );
|
|
|
|
|
|
int flexnbd_serve( struct flexnbd * flexnbd );
|
|
int flexnbd_proxy( struct flexnbd * flexnbd );
|
|
struct server * flexnbd_server( struct flexnbd * flexnbd );
|
|
void flexnbd_replace_acl( struct flexnbd * flexnbd, struct acl * acl );
|
|
struct status * flexnbd_status_create( struct flexnbd * flexnbd );
|
|
#endif
|
|
|