lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

[disorder] / server / disorder-server.h

diff --git a/server/disorder-server.h b/server/disorder-server.h
index bdc0ef9e433a317a7dabbdb3cb6f7ecec83cd625..78b8cfa4766f282fa6bb5729c3e73009f6533da9 100644 (file)
--- a/server/disorder-server.h
+++ b/server/disorder-server.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2008-2010 Richard Kettlewell
+ * Copyright (C) 2008-2012 Richard Kettlewell

  *
  * 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
  *
  * 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


@@ -33,7 +33,6 @@
 #include <grp.h>
 #include <locale.h>
 #include <netinet/in.h>
 #include <grp.h>
 #include <locale.h>
 #include <netinet/in.h>

-#include <pcre.h>

 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>


@@ -241,6 +240,9 @@ int server_start(ev_source *ev, int pf,
 int server_stop(ev_source *ev, int fd);
 /* Stop listening on @fd@ */
 
 int server_stop(ev_source *ev, int fd);
 /* Stop listening on @fd@ */
 

+void rtp_request(const struct sockaddr_storage *sa);
+void rtp_request_cancel(const struct sockaddr_storage *sa);
+

 extern int volume_left, volume_right;  /* last known volume */
 
 extern int wideopen;                   /* blindly accept all logins */
 extern int volume_left, volume_right;  /* last known volume */
 
 extern int wideopen;                   /* blindly accept all logins */