X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=d62781c449b53f09bc628aee0101e3b9d635847a;hp=335950b76b5c949a3be38a7f1e9c74d68e513f3d;hb=c430e588047c5db3eb0d043c4dd1378680ec2bcf;hpb=1776383c89bcc2bec6b469b3d58d5f5c3a37f090 diff --git a/error.h b/error.h index 335950b7..d62781c4 100644 --- a/error.h +++ b/error.h @@ -19,14 +19,47 @@ /** \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}; +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_FD, + SS_GUI, + SS_RINGBUFFER}; + #define NUM_SS (SS_RINGBUFFER + 1) extern const char **para_errlist[]; /** \endcond */ @@ -104,11 +137,11 @@ extern const char **para_errlist[]; #define GRAB_CLIENT_ERRORS \ PARA_ERROR(PEDANTIC_GRAB, "fd not ready and pedantic grab requested"), \ PARA_ERROR(GC_WRITE, "grab client write error"), \ - PARA_ERROR(INVALID_GRAB_MODE, "invalid grab client mode"), \ PARA_ERROR(BAD_GC_SLOT, "invalid slot requested by grab client"), \ PARA_ERROR(BAD_GC_FILTER_NUM, "invalid filter number given"), \ PARA_ERROR(GC_SYNTAX, "grab client syntax error"), \ PARA_ERROR(GC_HELP_GIVEN, ""), /* not really an error */ \ + PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an error */ \ #define MP3DEC_ERRORS \ @@ -125,6 +158,7 @@ extern const char **para_errlist[]; PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \ PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ PARA_ERROR(WAITPID, "waitpid error"), \ + PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \ #define STRING_ERRORS \ @@ -238,6 +272,27 @@ extern const char **para_errlist[]; PARA_ERROR(SHM_ATTACH, "can not attach shared memory area"), \ PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \ + +#define DCCP_ERRORS \ + PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \ + PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \ + PARA_ERROR(DCCP_SERVICE, "could not get service code"), \ + + +#define DCCP_RECV_ERRORS \ + PARA_ERROR(ADDR_INFO, "getaddrinfo error"), \ + PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \ + PARA_ERROR(DCCP_CONNECT, "dccp connect error"), \ + +#define DCCP_SEND_ERRORS \ + PARA_ERROR(DCCP_BIND, "dccp bind error"), \ + PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \ + PARA_ERROR(DCCP_WRITE, "dccp write error"), \ + +#define FD_ERRORS \ + PARA_ERROR(F_GETFL, "failed to get fd flags"), \ + PARA_ERROR(F_SETFL, "failed to set fd flags") + /* these do not need error handling (yet) */ #define SERVER_ERRORS #define WAV_ERRORS @@ -246,6 +301,7 @@ extern const char **para_errlist[]; #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS #define ORTP_SEND_ERRORS +#define GUI_ERRORS #define RINGBUFFER_ERRORS @@ -352,6 +408,11 @@ SS_ENUM(ORTP_SEND); SS_ENUM(DB); SS_ENUM(MYSQL_SELECTOR); SS_ENUM(IPC); +SS_ENUM(DCCP); +SS_ENUM(DCCP_RECV); +SS_ENUM(DCCP_SEND); +SS_ENUM(FD); +SS_ENUM(GUI); SS_ENUM(RINGBUFFER); /** \endcond */ #undef PARA_ERROR