Merge branch 'dccp'

Fix up merge conflicts by hand.
Conflicts:

	configure.ac
	error.h
	server.ggo

diff --cc configure.ac
index 06cbe7acf9ad56860280a80254290f2f8987ebf1,224d840aed872e2cd26f75e0d46a7e7ae50f765d..fd34ed900790d90cd0eee4da239699ebcc00bb9e
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -72,8 -72,8 +72,8 @@@ audiod_errlist_objs="audiod exec close_
  audiod_ldflags=""
  
  server_cmdline_objs="server.cmdline"
 -server_errlist_objs="server mp3 afs command net string signal random_dbtool time daemon stat
 -      crypt http_send dccp dccp_send db close_on_fork plm_dbtool ipc"
 +server_errlist_objs="server mp3 afs command net string signal random_selector
-       time daemon stat crypt http_send db close_on_fork playlist_selector ipc"
++      time daemon stat crypt http_send db close_on_fork playlist_selector ipc dccp dccp_send"
  server_ldflags=""
  
  ########################################################################### ssl

diff --cc error.h
index 335950b76b5c949a3be38a7f1e9c74d68e513f3d,9ed59c15564d50da538528c6b931f15d6be5323d..4b3cce28bf4f67b69d4d5abe8749a8d8e4846daa
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -19,14 -19,13 +19,45 @@@
  /** \file error.h list of error messages for all subsystems */
  
  /** \cond list of all subsystems that support the shiny new error facility */
--enum para_subsystem {SS_RECV,
--      SS_NET, SS_ORTP_RECV, SS_AUDIOD, SS_EXEC, SS_CLOSE_ON_FORK, SS_SIGNAL,
--      SS_STRING, SS_DAEMON, SS_STAT, SS_TIME, SS_GRAB_CLIENT, SS_HTTP_RECV,
--      SS_RECV_COMMON, SS_FILTER_CHAIN, SS_WAV, SS_COMPRESS, SS_OGGDEC, SS_FILTER,
-       SS_COMMAND, SS_RANDOM_SELECTOR, SS_PLAYLIST_SELECTOR, SS_CRYPT,
-       SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
-       SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL_SELECTOR,
-       SS_IPC, SS_RINGBUFFER};
 -      SS_COMMAND, SS_RANDOM_DBTOOL, SS_PLM_DBTOOL, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
 -      SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_IPC, SS_DCCP, SS_DCCP_RECV,
 -      SS_DCCP_SEND, SS_RINGBUFFER};
++enum para_subsystem {
++      SS_RECV,
++      SS_NET,
++      SS_ORTP_RECV,
++      SS_AUDIOD,
++      SS_EXEC,
++      SS_CLOSE_ON_FORK,
++      SS_SIGNAL,
++      SS_STRING,
++      SS_DAEMON,
++      SS_STAT,
++      SS_TIME,
++      SS_GRAB_CLIENT,
++      SS_HTTP_RECV,
++      SS_RECV_COMMON,
++      SS_FILTER_CHAIN,
++      SS_WAV,
++      SS_COMPRESS,
++      SS_OGGDEC,
++      SS_FILTER,
++      SS_COMMAND,
++      SS_RANDOM_SELECTOR,
++      SS_PLAYLIST_SELECTOR,
++      SS_CRYPT,
++      SS_HTTP_SEND,
++      SS_ORTP_SEND,
++      SS_DB,
++      SS_OGG,
++      SS_MP3,
++      SS_MP3DEC,
++      SS_SERVER,
++      SS_AFS,
++      SS_MYSQL_SELECTOR,
++      SS_IPC,
++      SS_DCCP,
++      SS_DCCP_RECV,
++      SS_DCCP_SEND,
++      SS_RINGBUFFER};
++
  #define NUM_SS (SS_RINGBUFFER + 1)
  extern const char **para_errlist[];
  /** \endcond */
@@@ -350,8 -366,11 +398,11 @@@ SS_ENUM(CRYPT)
  SS_ENUM(HTTP_SEND);
  SS_ENUM(ORTP_SEND);
  SS_ENUM(DB);
 -SS_ENUM(MYSQL);
 +SS_ENUM(MYSQL_SELECTOR);
  SS_ENUM(IPC);
+ SS_ENUM(DCCP);
+ SS_ENUM(DCCP_RECV);
+ SS_ENUM(DCCP_SEND);
  SS_ENUM(RINGBUFFER);
  /** \endcond */
  #undef PARA_ERROR

diff --cc server.c
Simple merge

diff --cc server.ggo
index 27727deb92587f26971b05252867b9bf064fe8cb,418b2b4aaaa7bbe2cb38d2bc378e3921c2a2f441..0cf4bb625bcf56b4bf53c19558044c4137252055
--- 1/server.ggo
--- 2/server.ggo
+++ b/server.ggo
@@@ -33,7 -35,10 +33,10 @@@ option "http_access" - "Add given host/
  option "http_no_autostart" - "do not open tcp port on server startup" flag off
  option "http_max_clients" - "maximal simultaneous connections, non-positive value means unlimited" int typestr="number" default="-1" no
  
 -section "Dccp sender options"
++section "dccp sender"
+ option "dccp_port" - "port for http streaming" int typestr="portnumber" default="5001" no
+ 
 -section "Ortp sender options"
 +section "ortp sender"
  option "ortp_target" - "Add given host/port to the list of targets. This option can be given multiple times. Example: '224.0.1.38:1500' instructs the ortp sender to send to udp port 1500 on host 224.0.1.38 (unassigned ip in the Local Network Control Block 224.0.0/24). This is useful for LAN-streaming." string typestr="a.b.c.d:p" no multiple
  option "ortp_no_autostart" - "do not start to send automatically" flag off
  option "ortp_default_port" - "default udp port if not specified" int typestr="portnumber" default="1500" no