atm-br2684ctl-syslog.patch

   1 --- atm/pppbr-001212-br2684ctl.c~       Thu Jan 11 17:21:03 2001
   2 +++ atm/pppbr-001212-br2684ctl.c        Thu Jan 11 17:30:38 2001
   3 @@ -4,6 +4,7 @@
   4  #include <errno.h>
   5  #include <sys/ioctl.h>
   6  #include <string.h>
   7 +#include <syslog.h>
   8  #include <atm.h>
   9  #include <linux/atmdev.h>
  10  #include <linux/atmbr2684.h>
  11 @@ -16,7 +16,7 @@
  12
  13  void fatal(char *str, int i)
  14  {
  15 -       perror(str);
  16 +       syslog(LOG_ERR, str);
  17         exit(-2);
  18  };
  19
  20 @@ -39,11 +39,11 @@
  21            ni.mtu = 1500;
  22            sprintf(ni.ifname, "nas%d", num);
  23             err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni);
  24 -           printf("create:%d\n",err);
  25 +           syslog(LOG_INFO,"create:%d\n",err);
  26             if (err>=0) ;;;
  27             lastitf=num;        /* even if we didn't create, because existed, assign_vcc wil want to know it! */
  28            } else {
  29 -               fprintf (stderr, "err: strange itf number %d", num );
  30 +               syslog(LOG_WARNING, "err: strange itf number %d", num );
  31            }
  32            }
  33    return 0;
  34 @@ -59,19 +59,19 @@
  35
  36         memset(&addr, 0, sizeof(addr));
  37         err=text2atm(astr,(struct sockaddr *)(&addr), sizeof(addr), T2A_PVC);
  38 -           printf("text2atm:%d\n",err);
  39 +           syslog(LOG_INFO,"text2atm:%d\n",err);
  40  #if 0
  41         addr.sap_family = AF_ATMPVC;
  42      addr.sap_addr.itf = itf;
  43      addr.sap_addr.vpi = 0;
  44      addr.sap_addr.vci = vci;
  45  #endif
  46 -    fprintf(stderr,"Communicating over ATM %d.%d.%d\n", addr.sap_addr.itf,
  47 +    syslog(LOG_INFO,"Communicating over ATM %d.%d.%d\n", addr.sap_addr.itf,
  48                                             addr.sap_addr.vpi,
  49                                             addr.sap_addr.vci);
  50
  51      if ((fd = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5)) < 0)
  52 -       fprintf(stderr,"failed to create socket %d", errno);
  53 +       syslog(LOG_ERR,"failed to create socket %d", errno);
  54
  55
  56      memset(&qos, 0, sizeof(qos));
  57 @@ -82,10 +82,10 @@
  58      qos.rxtp = qos.txtp;
  59
  60          err=setsockopt(fd,SOL_SOCKET,SO_SNDBUF, &bufsize ,sizeof(bufsize));
  61 -        fprintf(stderr,"setsockopt SO_SNDBUF: (%d) %s\n",err, strerror(err));
  62 +        syslog(LOG_ERR,"setsockopt SO_SNDBUF: (%d) %s\n",err, strerror(err));
  63
  64      if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0)
  65 -        fprintf(stderr,"setsockopt SO_ATMQOS %d", errno);
  66 +        syslog(LOG_ERR,"setsockopt SO_ATMQOS %d", errno);
  67
  68         err = connect(fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_atmpvc));
  69
  70 @@ -105,7 +105,7 @@
  71      be.send_padding = 0;
  72      be.min_size = 0;
  73             err=ioctl (fd, ATM_SETBACKEND, &be);
  74 -           fprintf(stderr, "assign:%d\n",err);
  75 +           syslog(LOG_INFO, "assign:%d\n",err);
  76
  77      return fd ;
  78  }
  79 @@ -123,6 +123,7 @@
  80         lastsock=-1;
  81         lastitf=0;
  82
  83 +       openlog("br2684ctl",LOG_PID,LOG_DAEMON);
  84  while ((c = getopt(argc, argv,"a:bc:e:s:")) !=EOF)
  85         switch (c) {
  86                 case 'a':
  87 @@ -137,14 +138,14 @@
  88                 case 'e':
  89                         encap=(atoi(optarg));
  90                         if(encap<0){
  91 -                               fprintf(stderr, "invalid encap: %s:\n",optarg);
  92 +                               syslog(LOG_INFO, "invalid encap: %s:\n",optarg);
  93                                 encap=0;
  94                         }
  95                         break;
  96                 case 's':
  97                         sndbuf=(atoi(optarg));
  98                         if(sndbuf<0){
  99 -                               fprintf(stderr, "invalid sndbuf: %s:\n",optarg);
 100 +                               syslog(LOG_INFO, "invalid sndbuf: %s:\n",optarg);
 101                                 sndbuf=8192;
 102                         }
 103                         break;
 104 @@ -160,10 +161,10 @@
 105         /* this seems to be broken, do not use -b for now */
 106                 pid=fork();
 107                 if (pid < 0) {
 108 -                       fprintf(stderr,"fork returned negative: %d\n", pid);
 109 +                       syslog(LOG_ERR,"fork returned negative: %d\n", pid);
 110                         exit(2);
 111                 } else if (pid) {
 112 -                       fprintf(stderr,"Background pid: %d\n",pid);
 113 +                       syslog(LOG_INFO,"Background pid: %d\n",pid);
 114                         exit(0);
 115                 }
 116         }