netperf-2.4.5-netserver.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch?view=log
  2. # Set DEBUG_LOG_FILE location
  3. # Fix compiler warnings (bug #337422):
  4. netserver.c: In function ‘process_requests’:
  5. netserver.c:287: warning: array subscript is above array bounds
  6. inlined from ‘process_requests’ at netserver.c:268:
  7. /usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
  8. inlined from ‘process_requests’ at netserver.c:284:
  9. /usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
  10. --- a/src/netserver.c
  11. +++ b/src/netserver.c
  12. @@ -142,7 +142,7 @@
  13. #ifndef DEBUG_LOG_FILE
  14. #ifndef WIN32
  15. -#define DEBUG_LOG_FILE "/tmp/netperf.debug"
  16. +#define DEBUG_LOG_FILE "/var/log/netperf.debug"
  17. #else
  18. #define DEBUG_LOG_FILE "c:\\temp\\netperf.debug"
  19. #endif /* WIN32 */
  20. @@ -266,7 +266,7 @@
  21. (!strstr(local_machine,delims[i])) &&
  22. (!strstr(local_version,delims[i]))) {
  23. snprintf((char *)netperf_response.content.test_specific_data,
  24. - sizeof(netperf_response) - 7,
  25. + MAXSPECDATA,
  26. "%c%s%c%s%c%s%c%s",
  27. delims[i][0],
  28. local_sysname,
  29. @@ -282,15 +282,15 @@
  30. if (i == 4) {
  31. /* none of the delimiters were unique, use the last one */
  32. snprintf((char *)netperf_response.content.test_specific_data,
  33. - sizeof(netperf_response) - 7,
  34. + MAXSPECDATA,
  35. "%c%s%c%s%c%s%c%s",
  36. - delims[i][0],
  37. + delims[3][0],
  38. "NoDelimUnique",
  39. - delims[i][0],
  40. + delims[3][0],
  41. "NoDelimUnique",
  42. - delims[i][0],
  43. + delims[3][0],
  44. "NoDelimUnique",
  45. - delims[i][0],
  46. + delims[3][0],
  47. "NoDelimUnique");
  48. }
  49. send_response_n(0);