Advertisement
Guest User

Untitled

a guest
Apr 9th, 2012
76
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.74 KB | None | 0 0
  1. root@TP:/var/tmp/netd.4.0.4# for i in `ls`; do echo $i ; diff $i /home/cass/AOSP-4.0.4/system/netd/$i; done
  2. Android.mk
  3. 20d19
  4. < oem_iptables_hook.cpp \
  5. BandwidthController.cpp
  6. 48d47
  7. < #include "oem_iptables_hook.h"
  8. 235,236d233
  9. < setupOemIptablesHook();
  10. <
  11. 245d241
  12. < setupOemIptablesHook();
  13. BandwidthController.h
  14. CleanSpec.mk
  15. CommandListener.cpp
  16. CommandListener.h
  17. DnsProxyListener.cpp
  18. DnsProxyListener.h
  19. logwrapper.c
  20. 203c203
  21. < if (strnlen(command, sizeof(buffer) - 1) == sizeof(buffer) - 1) {
  22. ---
  23. > if (strnlen(buffer, sizeof(buffer) - 1) == sizeof(buffer) - 1) {
  24. main.cpp
  25. NatController.cpp
  26. 32d31
  27. < #include "oem_iptables_hook.h"
  28. 86,87d84
  29. <
  30. < setupOemIptablesHook();
  31. 92c89
  32. < if (strlen(iface) > IFNAMSIZ) return false;
  33. ---
  34. > if (strlen(iface) > MAX_IFACE_LENGTH) return false;
  35. 269,270c266,272
  36. < // handle decrement to 0 case (do reset to defaults) and erroneous dec below 0
  37. < setDefaults();
  38. ---
  39. > char bootmode[PROPERTY_VALUE_MAX] = {0};
  40. > property_get("ro.bootmode", bootmode, "unknown");
  41. > if (0 != strcmp("bp-tools", bootmode)) {
  42. > // handle decrement to 0 case (do reset to defaults) and erroneous dec below 0
  43. > setDefaults();
  44. > }
  45. > natCount = 0;
  46. NatController.h
  47. ndc.c
  48. NetdCommand.cpp
  49. NetdCommand.h
  50. NetlinkHandler.cpp
  51. NetlinkHandler.h
  52. NetlinkManager.cpp
  53. NetlinkManager.h
  54. oem_iptables_hook.cpp
  55. diff: /home/cass/AOSP-4.0.4/system/netd/oem_iptables_hook.cpp: No such file or directory
  56. oem_iptables_hook.h
  57. diff: /home/cass/AOSP-4.0.4/system/netd/oem_iptables_hook.h: No such file or directory
  58. PanController.cpp
  59. PanController.h
  60. PppController.cpp
  61. PppController.h
  62. ResolverController.cpp
  63. ResolverController.h
  64. ResponseCode.h
  65. SecondaryTableController.cpp
  66. 58,59c58
  67. < // compare through the final null, hence +1
  68. < if (strncmp(iface, mInterfaceTable[i], IFNAMSIZ + 1) == 0) {
  69. ---
  70. > if (strncmp(iface, mInterfaceTable[i], MAX_IFACE_LENGTH) == 0) {
  71. 77,79c76
  72. < strncpy(mInterfaceTable[tableIndex], iface, IFNAMSIZ);
  73. < // Ensure null termination even if truncation happened
  74. < mInterfaceTable[tableIndex][IFNAMSIZ] = 0;
  75. ---
  76. > strncpy(mInterfaceTable[tableIndex], iface, MAX_IFACE_LENGTH);
  77. SecondaryTableController.h
  78. 22,27c22
  79. < #include <linux/if.h>
  80. <
  81. < #ifndef IFNAMSIZ
  82. < #define IFNAMSIZ 16
  83. < #endif
  84. <
  85. ---
  86. > static const unsigned int MAX_IFACE_LENGTH = 10;
  87. 46c41
  88. < char mInterfaceTable[INTERFACES_TRACKED][IFNAMSIZ + 1];
  89. ---
  90. > char mInterfaceTable[INTERFACES_TRACKED][MAX_IFACE_LENGTH];
  91. SoftapController.cpp
  92. SoftapController.h
  93. TetherController.cpp
  94. TetherController.h
  95. ThrottleController.cpp
  96. ThrottleController.h
  97. root@TP:/var/tmp/netd.4.0.4#
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement