mDNSResponder-107.6-bcopy.patch 6.6 KB

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