Changeset 4779:64fbda1f79f8 in roaraudio for libroar

Timestamp:

03/10/11 19:51:12 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for a simple trap mechanism (pr1)

Location:

libroar

Files:

• Makefile (modified) (1 diff)
• config.c (modified) (2 diffs)
• trap.c (added)

libroar/Makefile

@@ -11 +11 @@
 PASSWORD=passwordapi.o pinentry.o sshaskpass.o
 CRYPTO=crypto.o random.o $(HASHES) crc.o
-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
+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
 
 #DEFINES        = -DDEBUG

libroar/config.c

@@ -49 +49 @@
   memset(&config, 0, sizeof(config));
 
+#ifdef ROAR_SUPPORT_TRAP
+  config.trap_policy = ROAR_TRAP_IGNORE;
+#endif
   config.server   = NULL;
   config.authfile = NULL;
@@ -236 +239 @@
     ROAR_WARN("roar_libroar_config_parse(*): Unknown warning option: %s", v);
    }
+#ifdef ROAR_SUPPORT_TRAP
+  } else if ( !strcmp(k, "trap-policy") ) {
+   if ( !strcmp(v, "ignore") ) {
+    config->trap_policy = ROAR_TRAP_IGNORE;
+   } else if ( !strcmp(v, "warn") ) {
+    config->trap_policy = ROAR_TRAP_WARN;
+   } else if ( !strcmp(v, "abort") ) {
+    config->trap_policy = ROAR_TRAP_ABORT;
+#ifdef SIGKILL
+   } else if ( !strcmp(v, "kill") ) {
+    config->trap_policy = ROAR_TRAP_KILL;
+#endif
+#ifdef SIGSTOP
+   } else if ( !strcmp(v, "stop") ) {
+    config->trap_policy = ROAR_TRAP_STOP;
+#endif
+   } else {
+    ROAR_WARN("roar_libroar_config_parse(*): Unknown trap policy: %s", v);
+   }
+#endif
   } else if ( !strcmp(k, "force-rate") ) {
    config->info.rate = atoi(v);