Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 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
- Android.mk
- 20d19
- < oem_iptables_hook.cpp \
- BandwidthController.cpp
- 48d47
- < #include "oem_iptables_hook.h"
- 235,236d233
- < setupOemIptablesHook();
- <
- 245d241
- < setupOemIptablesHook();
- BandwidthController.h
- CleanSpec.mk
- CommandListener.cpp
- CommandListener.h
- DnsProxyListener.cpp
- DnsProxyListener.h
- logwrapper.c
- 203c203
- < if (strnlen(command, sizeof(buffer) - 1) == sizeof(buffer) - 1) {
- ---
- > if (strnlen(buffer, sizeof(buffer) - 1) == sizeof(buffer) - 1) {
- main.cpp
- NatController.cpp
- 32d31
- < #include "oem_iptables_hook.h"
- 86,87d84
- <
- < setupOemIptablesHook();
- 92c89
- < if (strlen(iface) > IFNAMSIZ) return false;
- ---
- > if (strlen(iface) > MAX_IFACE_LENGTH) return false;
- 269,270c266,272
- < // handle decrement to 0 case (do reset to defaults) and erroneous dec below 0
- < setDefaults();
- ---
- > char bootmode[PROPERTY_VALUE_MAX] = {0};
- > property_get("ro.bootmode", bootmode, "unknown");
- > if (0 != strcmp("bp-tools", bootmode)) {
- > // handle decrement to 0 case (do reset to defaults) and erroneous dec below 0
- > setDefaults();
- > }
- > natCount = 0;
- NatController.h
- ndc.c
- NetdCommand.cpp
- NetdCommand.h
- NetlinkHandler.cpp
- NetlinkHandler.h
- NetlinkManager.cpp
- NetlinkManager.h
- oem_iptables_hook.cpp
- diff: /home/cass/AOSP-4.0.4/system/netd/oem_iptables_hook.cpp: No such file or directory
- oem_iptables_hook.h
- diff: /home/cass/AOSP-4.0.4/system/netd/oem_iptables_hook.h: No such file or directory
- PanController.cpp
- PanController.h
- PppController.cpp
- PppController.h
- ResolverController.cpp
- ResolverController.h
- ResponseCode.h
- SecondaryTableController.cpp
- 58,59c58
- < // compare through the final null, hence +1
- < if (strncmp(iface, mInterfaceTable[i], IFNAMSIZ + 1) == 0) {
- ---
- > if (strncmp(iface, mInterfaceTable[i], MAX_IFACE_LENGTH) == 0) {
- 77,79c76
- < strncpy(mInterfaceTable[tableIndex], iface, IFNAMSIZ);
- < // Ensure null termination even if truncation happened
- < mInterfaceTable[tableIndex][IFNAMSIZ] = 0;
- ---
- > strncpy(mInterfaceTable[tableIndex], iface, MAX_IFACE_LENGTH);
- SecondaryTableController.h
- 22,27c22
- < #include <linux/if.h>
- <
- < #ifndef IFNAMSIZ
- < #define IFNAMSIZ 16
- < #endif
- <
- ---
- > static const unsigned int MAX_IFACE_LENGTH = 10;
- 46c41
- < char mInterfaceTable[INTERFACES_TRACKED][IFNAMSIZ + 1];
- ---
- > char mInterfaceTable[INTERFACES_TRACKED][MAX_IFACE_LENGTH];
- SoftapController.cpp
- SoftapController.h
- TetherController.cpp
- TetherController.h
- ThrottleController.cpp
- ThrottleController.h
- root@TP:/var/tmp/netd.4.0.4#
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement