Google Git
Sign in
android / platform / system / netd / 2ebaf119e2bfd566910020d7ba01c8b12bc5fdf1
commit2ebaf119e2bfd566910020d7ba01c8b12bc5fdf1[log] [tgz]
authorChad Brubaker <cbrubaker@google.com>Mon Feb 24 15:45:10 2014 -0800
committerChad Brubaker <cbrubaker@google.com>Sat Mar 15 15:30:13 2014 -0700
tree973c90fbfc3a47dd0969c5fd9521bbbfa61ac58b
parent1a16c18adff2fd31b8393fb35223cd0bf1e5a509 [diff]
Allow overlap in UidMarkMap

To support simultaneous tuns UidMarkMap now allows for
overlaping/duplicate rules. If there are multiple rules for a given uid
the most recently added rule will be used in all cases.

When overlapping rules are added in addUidRule there may be multiple
iptables rules matching the uid. Since addUidRule appends it will use
the most recent rule as well, no change required. Previously
UidMarkMap->add would fail and the rule would never be added.

Bug: 12134439
Change-Id: I5f2976dd3ee334584a9f98f6eacd5edbe5c9bb6b
1 file changed
tree: 973c90fbfc3a47dd0969c5fd9521bbbfa61ac58b
  1. Android.mk
  2. BandwidthController.cpp
  3. BandwidthController.h
  4. ClatdController.cpp
  5. ClatdController.h
  6. CleanSpec.mk
  7. CommandListener.cpp
  8. CommandListener.h
  9. DnsProxyListener.cpp
  10. DnsProxyListener.h
  11. FirewallController.cpp
  12. FirewallController.h
  13. IdletimerController.cpp
  14. IdletimerController.h
  15. InterfaceController.cpp
  16. InterfaceController.h
  17. List.h
  18. main.cpp
  19. MDnsSdListener.cpp
  20. MDnsSdListener.h
  21. NatController.cpp
  22. NatController.h
  23. ndc.c
  24. NetdCommand.cpp
  25. NetdCommand.h
  26. NetdConstants.cpp
  27. NetdConstants.h
  28. NetlinkHandler.cpp
  29. NetlinkHandler.h
  30. NetlinkManager.cpp
  31. NetlinkManager.h
  32. oem_iptables_hook.cpp
  33. oem_iptables_hook.h
  34. PppController.cpp
  35. PppController.h
  36. ResolverController.cpp
  37. ResolverController.h
  38. ResponseCode.h
  39. SecondaryTableController.cpp
  40. SecondaryTableController.h
  41. SoftapController.cpp
  42. SoftapController.h
  43. TetherController.cpp
  44. TetherController.h
  45. UidMarkMap.cpp
  46. UidMarkMap.h