2
0

100-debian.patch 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495
  1. Index: br2684ctl-20040226.orig/br2684ctl.c
  2. ===================================================================
  3. --- br2684ctl-20040226.orig.orig/br2684ctl.c 2007-06-04 13:22:22.142489112 +0200
  4. +++ br2684ctl-20040226.orig/br2684ctl.c 2007-06-04 13:22:22.213478320 +0200
  5. @@ -3,6 +3,8 @@
  6. #include <unistd.h>
  7. #include <errno.h>
  8. #include <sys/ioctl.h>
  9. +#include <sys/types.h>
  10. +#include <signal.h>
  11. #include <string.h>
  12. #include <syslog.h>
  13. #include <atm.h>
  14. @@ -22,9 +24,9 @@
  15. */
  16. -#define LOG_NAME "RFC1483/2684 bridge"
  17. -#define LOG_OPTION LOG_PERROR
  18. -#define LOG_FACILITY LOG_LOCAL0
  19. +#define LOG_NAME "br2684ctl"
  20. +#define LOG_OPTION LOG_PERROR|LOG_PID
  21. +#define LOG_FACILITY LOG_LOCAL2
  22. int lastsock, lastitf;
  23. @@ -39,10 +41,16 @@
  24. void exitFunc(void)
  25. {
  26. - syslog (LOG_PID,"Daemon terminated\n");
  27. + syslog (LOG_NOTICE,"Daemon terminated\n");
  28. }
  29. +void int_signal(int dummy)
  30. +{
  31. + syslog (LOG_INFO,"Killed by a signal\n");
  32. + exit(0);
  33. +}
  34. +
  35. int create_pidfile(int num)
  36. {
  37. FILE *pidfile = NULL;
  38. @@ -80,7 +88,7 @@
  39. err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni);
  40. if (err == 0)
  41. - syslog(LOG_INFO, "Interface \"%s\" created sucessfully\n",ni.ifname);
  42. + syslog(LOG_NOTICE, "Interface \"%s\" created sucessfully\n",ni.ifname);
  43. else
  44. syslog(LOG_INFO, "Interface \"%s\" could not be created, reason: %s\n",
  45. ni.ifname,
  46. @@ -112,7 +120,7 @@
  47. addr.sap_addr.vpi = 0;
  48. addr.sap_addr.vci = vci;
  49. #endif
  50. - syslog(LOG_INFO,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf,
  51. + syslog(LOG_NOTICE,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf,
  52. addr.sap_addr.vpi,
  53. addr.sap_addr.vci,
  54. encap?"VC mux":"LLC");
  55. @@ -261,11 +269,13 @@
  56. }
  57. create_pidfile(itfnum);
  58. + signal(SIGINT, int_signal);
  59. + signal(SIGTERM, int_signal);
  60. syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n");
  61. atexit (exitFunc);
  62. - while (1) sleep(30); /* to keep the sockets... */
  63. + while (1) pause(); /* to keep the sockets... */
  64. return 0;
  65. }
  66. Index: br2684ctl-20040226.orig/Makefile
  67. ===================================================================
  68. --- /dev/null 1970-01-01 00:00:00.000000000 +0000
  69. +++ br2684ctl-20040226.orig/Makefile 2007-06-04 13:22:22.215478016 +0200
  70. @@ -0,0 +1,13 @@
  71. +OPTS := -O2
  72. +CFLAGS := -Wall -g
  73. +LIBS := -latm
  74. +
  75. +all: br2684ctl
  76. +
  77. +br2684ctl: br2684ctl.c
  78. + $(CC) $(OPTS) $(CFLAGS) $(LIBS) $< -o $@
  79. +
  80. +distclean: clean
  81. +clean:
  82. + rm -f br2684ctl
  83. +