summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-10merge in ics-mr1-release history after reset to ics-mr1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1ics-mr1-releaseThe Android Automerger
2012-03-09merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-03-08merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-03-07netd: do check on command, not buffer.Nick Kralevich
Bug: 6132094 Change-Id: I76aef21b07c07db76bbc6587ae732b1ceb4488ce
2012-03-02merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-02-29Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
Define MAX_IFACE_LENGTH as IFNAMSIZ instead of 10, to prevent netd from treating an interface name 'rmnet_sdio0' as invalid. Also fix an off-by-one error. bug:5675718 Change-Id: I2b6ba823c89941031e5898b24dab388cd9c2dae8
2012-01-18merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-01-18Add back hook for inserting OEM specific iptables rules.android-cts-4.0.3_r2Kazuhiro Ondo
The functionality was lost during merge in ICS branch. This patch is adding back OEM iptables hook in netd. Bug:5862460 Change-Id: I9444b8c53e8b84fea2002c2c1d9ba42e45ae5f0c
2011-12-14netd: fix argument interpretation bugandroid-4.0.3_r1.1android-4.0.3_r1JP Abgrall
While working around the logwrap() issue, it was replaced with system() which could lead to various commands getting misinterpreted. We now use a system() equivalent that doesn't use "sh -c". Bug:5758556 Change-Id: I2599b526ac34bcfca18d05261286d902d547efda
2011-12-14netd: fix argument interpretation bugandroid-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r1JP Abgrall
While working around the logwrap() issue, it was replaced with system() which could lead to various commands getting misinterpreted. We now use a system() equivalent that doesn't use "sh -c". Bug:5758556 Change-Id: I2599b526ac34bcfca18d05261286d902d547efda
2011-11-22Fix some syntax issues with IP command.android-sdk-4.0.3_r1Robert Greenwalt
Was not building secondary tables properly. Also IPv6 host routes were failing. bug:5615697 Change-Id: I0d5ad2ed7d13e4d5bd8c2f8ce15fc0ccb36a4690
2011-11-04Start using IP tool for advanced routing.android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1ics-mr0-releaseics-mr0Robert Greenwalt
bug:5495862 bug:5396842 Change-Id: I51f21060947f57e63b18c4d35e9d49fac488d48a
2011-11-02When un-natting try to do all we canandroid-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-factoryrom-2-releaseRobert Greenwalt
Regardless of errors we should try to do as much as possible. Sometimes some steps may fail if interfaces are taken down before we can un-nat them. bug:5536516 Change-Id: I9c9b0123198dba890565e0a6e4e15add16b369c2
2011-10-25Use CCMP for WPA2 modeIrfan Sheriff
TKIP+CCMP for WPA and the secure CCMP for WPA2 Bug:5515097 Change-Id: I877d1f4075c3df83149aca23b59c285d2fe093e1
2011-10-07netd: bandwidth: tethering global alert supportJP Abgrall
Now, when nat is enabled/disabled it will let the bandwidthcontroller know that it might need to add/remove the matching global alert into the tethering rules in the FORWARD chain of iptables. Bug: 5336638 Change-Id: I1843f3f6601f371537f754a31db792e054b36a1d
2011-09-29Add support to disable/enable ipv6repo sync
Bug: 5388757 Change-Id: I0506254948477cbff05603faed625cc73d94d777
2011-09-27Move the code to delete IP addresses to ifc_utils.Lorenzo Colitti
Change-Id: I04c8de503229d1dce6bd08c286b7017eaea11039
2011-09-18netd: BandwidthController: support reading out tethering statsJP Abgrall
* Add ndc bandwidth gettetherstats <ifaceIn> <ifaceOut> which returns 221 ifaceIn ifaceOut rx_bytes rx_packets tx_bytes tx_packets If the iface pair is not found it will fail. 221 is the new response code for TetheringStatsResult. It gets the stats by looking at the iptables FORWARD chain's counters. * Fixed return handling after some of the responses. - no need for errorno - after ResponseCode >= 200, don't return another. * Correctly initialize the alert values on "bandwidth enable" Bug: 5244846,5230066 Change-Id: I81c941441525fa4055ae270d5cad05e6c42b8f72
2011-09-14Merge "Netd comand to change IPv6 privacy extensions"Irfan Sheriff
2011-09-14Netd comand to change IPv6 privacy extensionsIrfan Sheriff
Bug: 3360737 Change-Id: Ifa13c425c6168acdd01600d49c1fb52288c60d3c
2011-09-08netd: BandwidthController: exclude loopback in all alert rules.JP Abgrall
Have the alerts explicitly request "not loopback". Change-Id: I7a569292e630c2b8ec76489643741f53ab85b84e
2011-09-02Avoid setting prefix length for 0.0.0.0 addressIrfan Sheriff
The ioctl to set netmask fails when the interface address is 0.0.0.0. The kernel always keeps the netmask as 0 when the address is 0.0.0.0. Avoid making a call to prefix length when address is 0.0.0.0 Bug: 5255172 Change-Id: Id32f7823b2230fb9ac7cd45b0df1951f11338112
2011-08-11netd: all: use system() instead of logwrap() for now.JP Abgrall
The logwrapper uses a blocking read() which does not always correctly detect when the child process at the other end is gone. This is a quick workaround for http://b/5144246 A cleaner logwrapper parent() will follow. Add support for BandwidthController() to use either system() or logwrap(). It looks at "persist.bandwidth.uselogwrap" to be 0 or 1. Change-Id: I2d17732214f1a7fef6838eee05d827695b707ab0 Signed-off-by: JP Abgrall <jpa@google.com>
2011-08-03am e98a5816: am 6e4d5db1: Fix two error-case unwinders.Robert Greenwalt
* commit 'e98a581641a233fd048bf76f68650b627ef546e5': Fix two error-case unwinders.
2011-08-03am 6e4d5db1: Fix two error-case unwinders.Robert Greenwalt
* commit '6e4d5db1b11f808bb4bdcc8dd45a7158c6c88515': Fix two error-case unwinders.
2011-08-03Fix two error-case unwinders.Robert Greenwalt
Noticed by moto, I missed to calls to actually do the unwinding. Change-Id: Ie4da4979a3ad0eedcb6d468fecdff6614b1819bd
2011-08-02am 69a5b777: am ddb9f6eb: Add DROP rule for INVALID packets.Robert Greenwalt
* commit '69a5b7777f67f6d5ad9dbd33758332c7b0104613': Add DROP rule for INVALID packets.
2011-08-02am ddb9f6eb: Add DROP rule for INVALID packets.Robert Greenwalt
* commit 'ddb9f6eb8d8c35f46c1e3da68f375b85903e85c9': Add DROP rule for INVALID packets.
2011-08-02Add DROP rule for INVALID packets.Robert Greenwalt
bug:5094583 Change-Id: Ib942c557e7f2694b6ee18cc6562df597165894ce
2011-08-01Merge "softap: Increase delay after driver start to 800 ms (from 400)"Dmitry Shmidt
2011-08-01softap: Increase delay after driver start to 800 ms (from 400)Dmitry Shmidt
Workaround to avoid __nl80211_set_channel() to fail Change-Id: I710f18c66cff66413f7133d65b2adcf53d67a8e7 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-29am 51c1ce04: (-s ours) am 4309f87d: DO NOT MERGE: Update OEM iptable hooks ↵Wink Saville
and ip fwd * commit '51c1ce04e8b16f29aa8d9727e65263d8f590c543': DO NOT MERGE: Update OEM iptable hooks and ip fwd
2011-07-29am 4309f87d: DO NOT MERGE: Update OEM iptable hooks and ip fwdWink Saville
* commit '4309f87d5baa54a2741f35e0cb09959c55ff1ab6': DO NOT MERGE: Update OEM iptable hooks and ip fwd
2011-07-29DO NOT MERGE: Update OEM iptable hooks and ip fwdWink Saville
This is a squash of two changes from partner repo: Clean up OEM iptables hooks Id: Ife7a1c08ca88beba2dede776d2e4dd6097dad05a And Add hooks for OEM iptables rules and IP fwd - Useful for integrating peripherals that use IP for control and diagnostics. - Add hooks for specifying static iptables rules at startup. - Add system prop to keep IP forwarding enabled all the time. - Remove the ro.bootmode=bp-tools hacks. Id: Ic70d4c88179c530414505976193bf616037500a6 Bug: 5045218 Change-Id: I4229d3576426880b68ac448f9fbb67f2f8f304a0
2011-07-28Merge "netd: NetlinkManager: don't fail if NETLINK_NFLOG socket is not there."JP Abgrall
2011-07-26am 59da4baf: (-s ours) am b725a59f: Merge "DO NOT MERGE: NatController: ↵JP Abgrall
remove flushing the INPUT/OUTPUT tables." into honeycomb-LTE * commit '59da4baf881d7f5e2ae82bead547766cbf2c9710': DO NOT MERGE: NatController: remove flushing the INPUT/OUTPUT tables.
2011-07-26am 7d8c2811: am a45de8a8: Add dns proxy controls from opensource.Robert Greenwalt
* commit '7d8c2811e3604acfd6acfd2f7022919a633b394f': Add dns proxy controls from opensource.
2011-07-26am b725a59f: Merge "DO NOT MERGE: NatController: remove flushing the ↵JP Abgrall
INPUT/OUTPUT tables." into honeycomb-LTE * commit 'b725a59f3e45de8fcd3c01c512c94ba665acb992': DO NOT MERGE: NatController: remove flushing the INPUT/OUTPUT tables.
2011-07-26Merge "DO NOT MERGE: NatController: remove flushing the INPUT/OUTPUT ↵JP Abgrall
tables." into honeycomb-LTE
2011-07-26netd: NetlinkManager: don't fail if NETLINK_NFLOG socket is not there.JP Abgrall
Some kernels used with ICS do not have the needed modules (quota2 with NFLOG support). For those, we just don't allow NFLOG which will cripple quota alerts. This is a temp workaround until kernels are prebuilts. Change-Id: I403ba894aefb67996d791bd06055b8fec97d1407 Signed-off-by: JP Abgrall <jpa@google.com>
2011-07-26am a45de8a8: Add dns proxy controls from opensource.Robert Greenwalt
* commit 'a45de8a8d4def24fbcc21602400214b5ca7ffad1': Add dns proxy controls from opensource.
2011-07-26DO NOT MERGE: NatController: remove flushing the INPUT/OUTPUT tables.JP Abgrall
DO NOT MERGE: cherry-pick from master, as oem's will be updating this file in HC. It doesn't use them, so it should not have to flush them. This is a minimalistic attempt to cooperate with the BandwidthController. Change-Id: Ia175a86403adf034ac6f44d7ebc4ebe941881368
2011-07-25Add dns proxy controls from opensource.Robert Greenwalt
Port of change 22099 from the opensource. bug:5060618 Change-Id: Ic99345881fcb30c6f1d5545a32401e6ada865d78
2011-07-25wifi: Ensure that entropy file existsDmitry Shmidt
Change-Id: Ib5ea7a6767a4ab7c4244bfc27248ee04340018a7 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-25Merge "netd: NetlinkManager: add support receiving quota2 log messages"JP Abgrall
2011-07-25Merge "netd: bandwidthcontroler: add support for alerts via iptables' quota2 ↵JP Abgrall
log messages"
2011-07-24Merge "softap: Add P2P option to fwreload command"Dmitry Shmidt
2011-07-24softap: Add P2P option to fwreload commandDmitry Shmidt
Change-Id: I6fced56a6baa71a1d1fefe35832a43879ed12501 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-23Add config update support for hostapdIrfan Sheriff
Additional fixes: Fix putting hostapd in daemon mode which results in init taking it over and failure to stop Also fix security check Bug: 5069108 Change-Id: Ie0e2f975516975d270e48c9081480d85e201251f
2011-07-22Merge "softap: Add hostapd support if BOARD_HOSTAPD_DRIVER is set"Dmitry Shmidt