Changeset 4779:64fbda1f79f8 in roaraudio
- Timestamp:
- 03/10/11 19:51:12 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r4777 r4779 11 11 * Added support for use of DECnet and ARP neighbour tables to locate servers 12 12 (enumdev only at the moment) (pr1) 13 * Added support for a simple trap mechanism (pr1) 13 14 14 15 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET -
include/libroar/config.h
r4708 r4779 101 101 } x11; 102 102 size_t nowarncounter; 103 #ifdef ROAR_SUPPORT_TRAP 104 enum roar_trap_policy trap_policy; 105 #endif 103 106 }; 104 107 -
include/libroar/libroar.h
r4708 r4779 114 114 #include "roarfeatures.h" 115 115 #include "error.h" 116 #include "trap.h" 116 117 #include "config.h" 117 118 #include "roarfloat.h" -
libroar/Makefile
r4748 r4779 11 11 PASSWORD=passwordapi.o pinentry.o sshaskpass.o 12 12 CRYPTO=crypto.o random.o $(HASHES) crc.o 13 OBJS=libroar.o config.o debug.o error.o basic.o stream.o client.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o $(PASSWORD) $(VIO) stack.o slp.o nnode.o roardl.o roarx11.o beep.o proto.o env.o keyval.o vs.o ltm.o notify.o notify_proxy.o asyncctl.o enumdev.o serverinfo.o $(CRYPTO) authfile.o caps.o roarfloat.o base64.o 13 OBJS=libroar.o config.o debug.o error.o basic.o stream.o client.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o $(PASSWORD) $(VIO) stack.o slp.o nnode.o roardl.o roarx11.o beep.o proto.o env.o keyval.o vs.o ltm.o notify.o notify_proxy.o asyncctl.o enumdev.o serverinfo.o $(CRYPTO) authfile.o caps.o roarfloat.o base64.o trap.o 14 14 15 15 #DEFINES = -DDEBUG -
libroar/config.c
r4708 r4779 49 49 memset(&config, 0, sizeof(config)); 50 50 51 #ifdef ROAR_SUPPORT_TRAP 52 config.trap_policy = ROAR_TRAP_IGNORE; 53 #endif 51 54 config.server = NULL; 52 55 config.authfile = NULL; … … 236 239 ROAR_WARN("roar_libroar_config_parse(*): Unknown warning option: %s", v); 237 240 } 241 #ifdef ROAR_SUPPORT_TRAP 242 } else if ( !strcmp(k, "trap-policy") ) { 243 if ( !strcmp(v, "ignore") ) { 244 config->trap_policy = ROAR_TRAP_IGNORE; 245 } else if ( !strcmp(v, "warn") ) { 246 config->trap_policy = ROAR_TRAP_WARN; 247 } else if ( !strcmp(v, "abort") ) { 248 config->trap_policy = ROAR_TRAP_ABORT; 249 #ifdef SIGKILL 250 } else if ( !strcmp(v, "kill") ) { 251 config->trap_policy = ROAR_TRAP_KILL; 252 #endif 253 #ifdef SIGSTOP 254 } else if ( !strcmp(v, "stop") ) { 255 config->trap_policy = ROAR_TRAP_STOP; 256 #endif 257 } else { 258 ROAR_WARN("roar_libroar_config_parse(*): Unknown trap policy: %s", v); 259 } 260 #endif 238 261 } else if ( !strcmp(k, "force-rate") ) { 239 262 config->info.rate = atoi(v);
Note: See TracChangeset
for help on using the changeset viewer.