package/mdnsresponder/mDNSResponder-107.6-bcopy.patch

   1 diff -urN mDNSResponder-107.6-0rig/mDNSPosix/NetMonitor.c mDNSResponder-107.6/mDNSPosix/NetMonitor.c
   2 --- mDNSResponder-107.6-0rig/mDNSPosix/NetMonitor.c     2006-08-15 01:24:46.000000000 +0200
   3 +++ mDNSResponder-107.6/mDNSPosix/NetMonitor.c  2007-09-26 11:56:22.000000000 +0200
   4 @@ -30,6 +30,9 @@
   5      Change History (most recent first):
   6
   7  $Log: NetMonitor.c,v $
   8 +Revision 1.82-buildroot  2007/09/26 ulfs
   9 +Replace deprecated bcopy with memmove
  10 +
  11  Revision 1.82  2006/08/14 23:24:46  cheshire
  12  Re-licensed mDNSResponder daemon source code under Apache License, Version 2.0
  13
  14 @@ -308,7 +311,7 @@
  15
  16  #include <stdio.h>                     // For printf()
  17  #include <stdlib.h>                    // For malloc()
  18 -#include <string.h>                    // For bcopy()
  19 +#include <string.h>                    // For memmove()
  20  #include <time.h>                      // For "struct tm" etc.
  21  #include <signal.h>                    // For SIGINT, SIGTERM
  22  #include <netdb.h>                     // For gethostbyname()
  23 @@ -1155,7 +1158,7 @@
  24                         else if (inet_pton(AF_INET6, argv[i], &s6) == 1)
  25                                 {
  26                                 a.type = mDNSAddrType_IPv6;
  27 -                               bcopy(&s6, &a.ip.v6, sizeof(a.ip.v6));
  28 +                               memmove(&a.ip.v6, &s6, sizeof(a.ip.v6));
  29                                 }
  30                         else
  31                                 {
  32 diff -urN mDNSResponder-107.6-0rig/mDNSPosix/PosixDaemon.c mDNSResponder-107.6/mDNSPosix/PosixDaemon.c
  33 --- mDNSResponder-107.6-0rig/mDNSPosix/PosixDaemon.c    2006-08-29 08:24:34.000000000 +0200
  34 +++ mDNSResponder-107.6/mDNSPosix/PosixDaemon.c 2007-09-26 12:02:01.000000000 +0200
  35 @@ -231,8 +231,8 @@
  36         mDNS_PlatformSupport    platformStorage;
  37         mStatus                                 err;
  38
  39 -       bzero(&mDNSRecord, sizeof mDNSRecord);
  40 -       bzero(&platformStorage, sizeof platformStorage);
  41 +       memset(&mDNSRecord, '\0', sizeof mDNSRecord);
  42 +       memset(&platformStorage, '\0', sizeof platformStorage);
  43
  44         ParseCmdLinArgs(argc, argv);
  45
  46 @@ -317,7 +317,6 @@
  47                 LogMalloc("malloc( %s : %lu ) = %p", msg, size, &mem[2]);
  48                 mem[0] = 0xDEAD1234;
  49                 mem[1] = size;
  50 -               //bzero(&mem[2], size);
  51                 memset(&mem[2], 0xFF, size);
  52  //             validatelists(&mDNSStorage);
  53                 return(&mem[2]);
  54 @@ -336,7 +335,6 @@
  55                 if (mem[1] > 8000)
  56                         { LogMsg("free( %s : %ld @ %p) too big!", msg, mem[1], &mem[2]); return; }
  57                 LogMalloc("free( %s : %ld @ %p)", msg, mem[1], &mem[2]);
  58 -               //bzero(mem, mem[1]+8);
  59                 memset(mem, 0xDD, mem[1]+8);
  60  //             validatelists(&mDNSStorage);
  61                 free(mem);
  62 diff -urN mDNSResponder-107.6-0rig/mDNSShared/dnssd_clientstub.c mDNSResponder-107.6/mDNSShared/dnssd_clientstub.c
  63 --- mDNSResponder-107.6-0rig/mDNSShared/dnssd_clientstub.c      2006-09-07 06:43:12.000000000 +0200
  64 +++ mDNSResponder-107.6/mDNSShared/dnssd_clientstub.c   2007-09-26 12:05:10.000000000 +0200
  65 @@ -325,7 +325,7 @@
  66      msg = malloc(*len);
  67      if (!msg) return NULL;
  68
  69 -    bzero(msg, *len);
  70 +    memset(msg, '\0', *len);
  71      hdr = (void *)msg;
  72      hdr->datalen = datalen;
  73      hdr->version = VERSION;
  74 @@ -425,7 +425,7 @@
  75          // setup temporary error socket
  76          if ((listenfd = socket(AF_DNSSD, SOCK_STREAM, 0)) < 0)
  77              goto cleanup;
  78 -        bzero(&caddr, sizeof(caddr));
  79 +        memset(&caddr, '\0', sizeof(caddr));
  80
  81  #if defined(USE_TCP_LOOPBACK)
  82                         {
  83 diff -urN mDNSResponder-107.6-0rig/mDNSShared/uds_daemon.c mDNSResponder-107.6/mDNSShared/uds_daemon.c
  84 --- mDNSResponder-107.6-0rig/mDNSShared/uds_daemon.c    2006-08-29 08:24:36.000000000 +0200
  85 +++ mDNSResponder-107.6/mDNSShared/uds_daemon.c 2007-09-26 12:04:21.000000000 +0200
  86 @@ -990,7 +990,7 @@
  87                 goto error;
  88                 }
  89
  90 -    bzero(&laddr, sizeof(laddr));
  91 +    memset(&laddr,'\0', sizeof(laddr));
  92
  93         #if defined(USE_TCP_LOOPBACK)
  94                 {
  95 @@ -1291,7 +1291,7 @@
  96         // allocate a request_state struct that will live with the socket
  97      rstate = mallocL("connect_callback", sizeof(request_state));
  98      if (!rstate) FatalError("ERROR: malloc");
  99 -    bzero(rstate, sizeof(request_state));
 100 +    memset(rstate, '\0', sizeof(request_state));
 101      rstate->ts = t_morecoming;
 102      rstate->sd = sd;
 103
 104 @@ -1389,7 +1389,7 @@
 105                         {
 106                         char ctrl_path[MAX_CTLPATH];
 107                         get_string(&rstate->msgdata, ctrl_path, 256);   // path is first element in message buffer
 108 -                       bzero(&cliaddr, sizeof(cliaddr));
 109 +                       memset(&cliaddr, '\0', sizeof(cliaddr));
 110                         cliaddr.sun_family = AF_LOCAL;
 111                         strcpy(cliaddr.sun_path, ctrl_path);
 112                         }
 113 @@ -1495,7 +1495,7 @@
 114
 115      q = mallocL("DNSQuestion", sizeof(DNSQuestion));
 116      if (!q) FatalError("ERROR: handle_query - malloc");
 117 -    bzero(q, sizeof(DNSQuestion));
 118 +    memset(q, '\0', sizeof(DNSQuestion));
 119
 120      q->InterfaceID      = InterfaceID;
 121      q->Target           = zeroAddr;
 122 @@ -1576,7 +1576,7 @@
 123
 124      // set up termination info
 125      term = mallocL("handle_resolve_request", sizeof(resolve_termination_t));
 126 -    bzero(term, sizeof(*term));
 127 +    memset(term, '\0', sizeof(*term));
 128      if (!term) FatalError("ERROR: malloc");
 129
 130      // format questions
 131 @@ -2635,7 +2635,7 @@
 132                 return mStatus_NoMemoryErr;
 133          }
 134
 135 -    bzero(extra, sizeof(ExtraResourceRecord));  // OK if oversized rdata not zero'd
 136 +    memset(extra, '\0', sizeof(ExtraResourceRecord));  // OK if oversized rdata not zero'd
 137      extra->r.resrec.rrtype = rrtype;
 138      extra->r.rdatastorage.MaxRDLength = (mDNSu16) size;
 139      extra->r.resrec.rdlength = rdlen;
 140 @@ -3208,7 +3208,7 @@
 141
 142      rr = mallocL("read_rr_from_ipc_msg", sizeof(AuthRecord) - sizeof(RDataBody) + storage_size);
 143      if (!rr) FatalError("ERROR: malloc");
 144 -    bzero(rr, sizeof(AuthRecord));  // ok if oversized rdata not zero'd
 145 +    memset(rr, '\0', sizeof(AuthRecord));  // ok if oversized rdata not zero'd
 146
 147      mDNS_SetupResourceRecord(rr, mDNSNULL, mDNSPlatformInterfaceIDfromInterfaceIndex(gmDNS, interfaceIndex),
 148                 type, 0, (mDNSu8) ((flags & kDNSServiceFlagsShared) ? kDNSRecordTypeShared : kDNSRecordTypeUnique), mDNSNULL, mDNSNULL);
 149 @@ -3337,7 +3337,7 @@
 150                  return t_error;
 151                 }
 152              rs->msgdata = rs->msgbuf;
 153 -            bzero(rs->msgbuf, rs->hdr.datalen + MSG_PAD_BYTES);
 154 +            memset(rs->msgbuf, '\0', rs->hdr.datalen + MSG_PAD_BYTES);
 155              }
 156          nleft = rs->hdr.datalen - rs->data_bytes;
 157          nread = recv(rs->sd, rs->msgbuf + rs->data_bytes, nleft, 0);
 158 @@ -3431,14 +3431,14 @@
 159      totallen = (int) (datalen + sizeof(ipc_msg_hdr));
 160      reply = mallocL("create_reply", sizeof(reply_state));
 161      if (!reply) FatalError("ERROR: malloc");
 162 -    bzero(reply, sizeof(reply_state));
 163 +    memset(reply, '\0', sizeof(reply_state));
 164      reply->ts = t_morecoming;
 165      reply->sd = request->sd;
 166      reply->request = request;
 167      reply->len = totallen;
 168      reply->msgbuf = mallocL("create_reply", totallen);
 169      if (!reply->msgbuf) FatalError("ERROR: malloc");
 170 -    bzero(reply->msgbuf, totallen);
 171 +    memset(reply->msgbuf, '\0', totallen);
 172      reply->mhdr = (ipc_msg_hdr *)reply->msgbuf;
 173      reply->rhdr = (reply_hdr *)(reply->msgbuf + sizeof(ipc_msg_hdr));
 174      reply->sdata = reply->msgbuf + sizeof(ipc_msg_hdr) + sizeof(reply_hdr);