OSDN Git Service

android-x86/system-netd.git
12 years agoInitial release of mdns interface.
Robert Greenwalt [Thu, 29 Mar 2012 21:45:54 +0000 (14:45 -0700)]
Initial release of mdns interface.

Uses extern/mdnsresponder and communicate with the framework via nativedaemonconnector.

Change-Id: I5c090528197afa090836d7cb5bf75dfba33ff11c

12 years agonetd: Add support for interface idletimer netlink notifications.
Ashish Sharma [Wed, 11 Apr 2012 02:47:09 +0000 (19:47 -0700)]
netd: Add support for interface idletimer netlink notifications.

Change-Id: Ifda5b8ecf68533eea42b133dbe0a581b4401ab11

12 years agoMerge remote-tracking branch 'goog/ics-aah'
Mike Lockwood [Tue, 3 Apr 2012 17:32:37 +0000 (10:32 -0700)]
Merge remote-tracking branch 'goog/ics-aah'

12 years agoam 19ac8238: am 99c65114: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 16:09:01 +0000 (09:09 -0700)]
am 19ac8238: am 99c65114: Reconcile with ics-mr1-release

* commit '19ac823851c7f8691d5aecbc5a0149ba72ed806c':

12 years agoam 99c65114: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 16:06:32 +0000 (09:06 -0700)]
am 99c65114: Reconcile with ics-mr1-release

* commit '99c65114b976fd8ceb54021cede0dd63f8826a02':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 16:01:27 +0000 (09:01 -0700)]
Reconcile with ics-mr1-release

Change-Id: I6cf64c289005dccb3d60c972686b7c335aa015a4

12 years agoam d7a9ff6d: am 17654593: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 15:29:30 +0000 (08:29 -0700)]
am d7a9ff6d: am 17654593: Reconcile with ics-mr1-release

* commit 'd7a9ff6ddc2895d298598e53cf7b967742e0d4da':

12 years agoam 17654593: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 15:26:54 +0000 (08:26 -0700)]
am 17654593: Reconcile with ics-mr1-release

* commit '176545930d60a366734bbf70c3b60332a606c01e':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Mar 2012 15:23:48 +0000 (08:23 -0700)]
Reconcile with ics-mr1-release

Change-Id: If53997c291c7c51332b57f572fbbfc70f7527166

12 years agosoftap: Remove wmm_enabled=1 flag from SoftAP config
Dmitry Shmidt [Fri, 16 Mar 2012 19:33:34 +0000 (12:33 -0700)]
softap: Remove wmm_enabled=1 flag from SoftAP config

Change-Id: Id2b43001d95259fbaf25108bf95dfae3802b79bf
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 17:07:33 +0000 (09:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:24:06 +0000 (19:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "We are not reverting this CL since it was a temporary fix and we just submitte...
Selim Gurun [Fri, 9 Mar 2012 19:21:54 +0000 (11:21 -0800)]
Merge "We are not reverting this CL since it was a temporary fix and we just submitted the proper one."

12 years agoWe are not reverting this CL since it was a temporary fix and we just submitted the...
Selim Gurun [Fri, 9 Mar 2012 19:21:35 +0000 (11:21 -0800)]
We are not reverting this CL since it was a temporary fix and we just submitted the proper one.

Revert "Do not send extra data the client is not consuming."

This reverts commit 6217272e1a41fc9827250c675a0499d2091ec6ac

12 years agoMerge "Ignore Sigpipe in netd"
Selim Gurun [Fri, 9 Mar 2012 19:14:51 +0000 (11:14 -0800)]
Merge "Ignore Sigpipe in netd"

12 years agoMerge "ndc: Add default sequence number to command"
Dmitry Shmidt [Fri, 9 Mar 2012 17:48:03 +0000 (09:48 -0800)]
Merge "ndc: Add default sequence number to command"

12 years agoIgnore Sigpipe in netd
Selim Gurun [Fri, 9 Mar 2012 16:59:28 +0000 (08:59 -0800)]
Ignore Sigpipe in netd

Bug:6141847

Ignore sigpipe in netd. This will enable us remove the temporary
changes in DnsProxyListener that we added to temporarily resolve
issue 6138617.

Change-Id: I4bc13ac0fcf9dd0e7641c2d4459b1eab0ed50f2a

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Mar 2012 04:46:18 +0000 (20:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoDo not send extra data the client is not consuming.
Selim Gurun [Fri, 9 Mar 2012 02:17:48 +0000 (18:17 -0800)]
Do not send extra data the client is not consuming.

Bug:6138617

This is to temporarily fix a problem in netd. In case of an error do
not send extra data that the client is not expecting. This causes a
netd crash.

Change-Id: Iadb375e326577857034c2a7d2e962e4242d4735f

12 years agondc: Add default sequence number to command
Dmitry Shmidt [Fri, 9 Mar 2012 02:16:22 +0000 (18:16 -0800)]
ndc: Add default sequence number to command

Change-Id: I81ec40b8dd560eb9b6430eafc05d5e7714e0f042
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoam e1176866: am 88ec4ed2: am 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Thu, 8 Mar 2012 02:15:28 +0000 (18:15 -0800)]
am e1176866: am 88ec4ed2: am 1babab9f: netd: do check on command, not buffer.

* commit 'e1176866629c90bc1403926186bf2b7efc736a2a':

12 years agoam e2f132b7: (-s ours) am 19d7b786: am 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Thu, 8 Mar 2012 02:15:27 +0000 (18:15 -0800)]
am e2f132b7: (-s ours) am 19d7b786: am 1babab9f: netd: do check on command, not buffer.

* commit 'e2f132b7a224d1c2287292132b93f53b09d617cd':
  netd: do check on command, not buffer.

12 years agoMerge "Prevent potential stall on dns proxy operations."
Selim Gurun [Thu, 8 Mar 2012 01:05:31 +0000 (17:05 -0800)]
Merge "Prevent potential stall on dns proxy operations."

12 years agoam 88ec4ed2: am 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:38:08 +0000 (14:38 -0800)]
am 88ec4ed2: am 1babab9f: netd: do check on command, not buffer.

* commit '88ec4ed21deb1340675ba026fda46e6183c2e219':

12 years agoam 19d7b786: am 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:37:24 +0000 (14:37 -0800)]
am 19d7b786: am 1babab9f: netd: do check on command, not buffer.

* commit '19d7b786eed1c69a2d9d6d0764ad9cf8e97b9f72':
  netd: do check on command, not buffer.

12 years agoam 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:35:31 +0000 (14:35 -0800)]
am 1babab9f: netd: do check on command, not buffer.

* commit '1babab9febdbd05b7b6d72e0728f49ee8d4b9bd2':
  netd: do check on command, not buffer.

12 years agoam 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:35:12 +0000 (14:35 -0800)]
am 1babab9f: netd: do check on command, not buffer.

* commit '1babab9febdbd05b7b6d72e0728f49ee8d4b9bd2':
  netd: do check on command, not buffer.

12 years agoam 1babab9f: netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:34:56 +0000 (14:34 -0800)]
am 1babab9f: netd: do check on command, not buffer.

* commit '1babab9febdbd05b7b6d72e0728f49ee8d4b9bd2':
  netd: do check on command, not buffer.

12 years agonetd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 20:54:41 +0000 (12:54 -0800)]
netd: do check on command, not buffer.

Bug: 6132094
Change-Id: I76aef21b07c07db76bbc6587ae732b1ceb4488ce

12 years agonetd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 19:53:10 +0000 (11:53 -0800)]
netd: do check on command, not buffer.

Bug: 6132094
Change-Id: Icb3b0d0b2a0fd795c05162afc8791729bfa5d075

12 years agoMerge "Remove reference to hard-coded cpuctl path for bg"
Glenn Kasten [Wed, 7 Mar 2012 15:16:35 +0000 (07:16 -0800)]
Merge "Remove reference to hard-coded cpuctl path for bg"

12 years agoMerge "Use the new command numbering scheme."
Robert Greenwalt [Tue, 6 Mar 2012 19:30:35 +0000 (11:30 -0800)]
Merge "Use the new command numbering scheme."

12 years agoRemove reference to hard-coded cpuctl path for bg
Glenn Kasten [Mon, 5 Mar 2012 23:13:58 +0000 (15:13 -0800)]
Remove reference to hard-coded cpuctl path for bg

As part of scheduling policy cleanup, remove/isolate references to the
scheduling policy files and APIs.

In this case, logwrap is not used currently due to bug 5144246, and even
if it were the "background" parameter was 0.

Change-Id: Ibf7fa2617a0e485c9868b22b378636728d16622a

12 years agoMerge "remove dependency on utils/List.h"
Mathias Agopian [Tue, 6 Mar 2012 02:29:42 +0000 (18:29 -0800)]
Merge "remove dependency on utils/List.h"

12 years agoremove dependency on utils/List.h
Mathias Agopian [Tue, 6 Mar 2012 01:05:02 +0000 (17:05 -0800)]
remove dependency on utils/List.h

Change-Id: I45c7e2cf9fe07f65259af6fa22d719259386912c

12 years agoam 9c2d6591: am c91e3d47: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 3 Mar 2012 00:48:33 +0000 (16:48 -0800)]
am 9c2d6591: am c91e3d47: Reconcile with ics-mr1-release

* commit '9c2d659130f57082adafa9c0a86d308cb4fff6e7':

12 years agoam c91e3d47: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 3 Mar 2012 00:44:17 +0000 (16:44 -0800)]
am c91e3d47: Reconcile with ics-mr1-release

* commit 'c91e3d476a8002fc6e8f994152be5dc4b3b85489':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Sat, 3 Mar 2012 00:41:44 +0000 (16:41 -0800)]
Reconcile with ics-mr1-release

Change-Id: I94123eabf7bde1c98440858acbddacca8f91c4bb

12 years agoam e03c41b5: am 4d00f912: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 3 Mar 2012 00:37:53 +0000 (16:37 -0800)]
am e03c41b5: am 4d00f912: Reconcile with ics-mr1-release

* commit 'e03c41b50bd4bcfdf8a1c9f965200ab1a783b1d6':

12 years agoam 4d00f912: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 3 Mar 2012 00:35:25 +0000 (16:35 -0800)]
am 4d00f912: Reconcile with ics-mr1-release

* commit '4d00f91201adc92d2d7fc56322f264db2fa7c816':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Sat, 3 Mar 2012 00:33:57 +0000 (16:33 -0800)]
Reconcile with ics-mr1-release

Change-Id: I939f27b0ec63aa664bd606bd6ac7af4433d67c18

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 2 Mar 2012 19:52:34 +0000 (11:52 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoPrevent potential stall on dns proxy operations.
Selim Gurun [Tue, 28 Feb 2012 00:01:42 +0000 (16:01 -0800)]
Prevent potential stall on dns proxy operations.

Update wire protocol to return and process error code first. This
will make sure dns proxy operations do not stall when an internal
error happens.

Change-Id: I65595abb0638722ccd877f69057bd435ca06e524

12 years agoam b7aeeb6c: am 500e77d5: am 3c20787d: Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Thu, 1 Mar 2012 17:08:30 +0000 (09:08 -0800)]
am b7aeeb6c: am 500e77d5: am 3c20787d: Increase the valid name of the iface to IFNAMSIZ

* commit 'b7aeeb6cf2d473639b1a495361d888cbf52ab6c5':

12 years agoUse the new command numbering scheme.
Robert Greenwalt [Thu, 16 Feb 2012 22:48:11 +0000 (14:48 -0800)]
Use the new command numbering scheme.

Support multiple commands on a single socket via command numbers.
Native DaemonConnector has been changed, so we need to use it here
too.

bug:5864209
Change-Id: I084a284db38b996e7965bb9dd18440636eff9801

12 years agoresolved conflicts for merge of 924e6e4d to master
Robert Greenwalt [Wed, 29 Feb 2012 22:06:33 +0000 (14:06 -0800)]
resolved conflicts for merge of 924e6e4d to master

Change-Id: I98212c9d7004a9ae38e463036ae6ca97b9569dda

12 years agoam 500e77d5: am 3c20787d: Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:17:58 +0000 (12:17 -0800)]
am 500e77d5: am 3c20787d: Increase the valid name of the iface to IFNAMSIZ

* commit '500e77d5f596b9ee488ff2cf4309d81525c0d6fd':

12 years agoam 7de67315: am 3c20787d: Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:16:40 +0000 (12:16 -0800)]
am 7de67315: am 3c20787d: Increase the valid name of the iface to IFNAMSIZ

* commit '7de673157ed86b0ba4705a071380a103c1d1841e':
  Increase the valid name of the iface to IFNAMSIZ

12 years agoam 3c20787d: Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:14:17 +0000 (12:14 -0800)]
am 3c20787d: Increase the valid name of the iface to IFNAMSIZ

* commit '3c20787d7935c2016e8e3cc49d8f15647c12c41c':
  Increase the valid name of the iface to IFNAMSIZ

12 years agoam 3c20787d: Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:13:49 +0000 (12:13 -0800)]
am 3c20787d: Increase the valid name of the iface to IFNAMSIZ

* commit '3c20787d7935c2016e8e3cc49d8f15647c12c41c':
  Increase the valid name of the iface to IFNAMSIZ

12 years agoam 3c20787d: Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:13:48 +0000 (12:13 -0800)]
am 3c20787d: Increase the valid name of the iface to IFNAMSIZ

* commit '3c20787d7935c2016e8e3cc49d8f15647c12c41c':
  Increase the valid name of the iface to IFNAMSIZ

12 years agoIncrease the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Thu, 12 Jan 2012 00:29:28 +0000 (16:29 -0800)]
Increase the valid name of the iface to IFNAMSIZ

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

12 years agoMerge "netd: softap: Add ieee80211n=1 parameter for hotspot"
Dmitry Shmidt [Wed, 29 Feb 2012 18:00:23 +0000 (10:00 -0800)]
Merge "netd: softap: Add ieee80211n=1 parameter for hotspot"

12 years agonetd: softap: Add ieee80211n=1 parameter for hotspot
Dmitry Shmidt [Tue, 28 Feb 2012 20:41:45 +0000 (12:41 -0800)]
netd: softap: Add ieee80211n=1 parameter for hotspot

Change-Id: I73d862494c186a08066d8e3478667055bfc831a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoBandwidthController: fix format string bugs
Nick Kralevich [Thu, 23 Feb 2012 21:04:26 +0000 (13:04 -0800)]
BandwidthController: fix format string bugs

In 876666947664c718a8d0cae9bbddb06cc91f912c, a new %s
was added to ALERT_IPT_TEMPLATE. Not all users of this string
were updated.

This change modifies ALERT_IPT_TEMPLATE to be a #define, which
allows gcc's format string detection work.

Add -Werror=format to error out on any string format warning.

Testing: Code compiles. I don't know how to test this change
properly.

Bug: 5948299
Change-Id: I0ec307972e6bf50abd8ba099166c22069a6c6580

12 years agonetd: softap: Add wmm_enabled=1 option
Dmitry Shmidt [Mon, 13 Feb 2012 18:29:23 +0000 (10:29 -0800)]
netd: softap: Add wmm_enabled=1 option

Change-Id: I3742e1130e3d9e3074a67f2e1bdd13ef11bb77dc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoMerge "Increase the valid name of the iface to IFNAMSIZ"
Robert Greenwalt [Wed, 1 Feb 2012 18:16:07 +0000 (10:16 -0800)]
Merge "Increase the valid name of the iface to IFNAMSIZ"

12 years agoam c5c68d7b: am ad8126d0: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:05:46 +0000 (10:05 -0800)]
am c5c68d7b: am ad8126d0: Reconcile with ics-mr1-release

* commit 'c5c68d7b9b92b0f7f151fec20359ab75ea5fbc34':

12 years agoam ad8126d0: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:01:09 +0000 (10:01 -0800)]
am ad8126d0: Reconcile with ics-mr1-release

* commit 'ad8126d0199af924f8036a81297e1f67c3bba7ab':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 16:50:53 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release

Change-Id: Ica795e32aa94c9ea21b4a4f2acd84a9979c59c09

12 years agoIncrease the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Thu, 12 Jan 2012 00:29:28 +0000 (16:29 -0800)]
Increase the valid name of the iface to IFNAMSIZ

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.

Change-Id: If6b2b27d2da6eb72f01c090cbe4f7dc2b9c296ae

12 years agoMerge "Keep better tabs on secondary tables."
Robert Greenwalt [Wed, 1 Feb 2012 00:39:56 +0000 (16:39 -0800)]
Merge "Keep better tabs on secondary tables."

12 years agoKeep better tabs on secondary tables.
Robert Greenwalt [Tue, 31 Jan 2012 20:46:45 +0000 (12:46 -0800)]
Keep better tabs on secondary tables.

We had some places (NatController) where routes were being set
but not accounted for in the number-of-routes talley so we
could end up thinking the table was empty and not clean up
after ourselves properly.

Also consolidated constants.

bug:5917475
Change-Id: I98a41d433e1d4b4ca6692fb2328e2c9afc828145

12 years agoam a201914b: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 20 Jan 2012 23:52:24 +0000 (15:52 -0800)]
am a201914b: Reconcile with ics-mr1-release

* commit 'a201914b3b2f6910b4ce4d58a4f170d9ebaeb174':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 19 Jan 2012 21:07:15 +0000 (13:07 -0800)]
Reconcile with ics-mr1-release

Change-Id: I2e12ef9428b2f10e7cc87199edfa090cb9c7167e

12 years agonetd: Rename LOGI/LOGE to ALOGI/ALOGE
JP Abgrall [Thu, 19 Jan 2012 19:44:24 +0000 (11:44 -0800)]
netd: Rename LOGI/LOGE to ALOGI/ALOGE

The merge from ics-mr1 branch pulled in some oldschool LOGE/LOGI calls.

Change-Id: I3c452198375c4cdce085307e844f1d6aa491225b

12 years agoam b210b180: am 4ab46857: Add back hook for inserting OEM specific iptables rules.
Kazuhiro Ondo [Thu, 19 Jan 2012 18:54:39 +0000 (10:54 -0800)]
am b210b180: am 4ab46857: Add back hook for inserting OEM specific iptables rules.

* commit 'b210b1806c740bf66eb04eb8e8d8ee75c01652dd':
  Add back hook for inserting OEM specific iptables rules.

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 19 Jan 2012 05:18:48 +0000 (21:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 4ab46857: Add back hook for inserting OEM specific iptables rules.
Kazuhiro Ondo [Thu, 19 Jan 2012 00:14:21 +0000 (16:14 -0800)]
am 4ab46857: Add back hook for inserting OEM specific iptables rules.

* commit '4ab468577647d1ee73810b89d2287eaa5546fecb':
  Add back hook for inserting OEM specific iptables rules.

12 years agoam 4ab46857: Add back hook for inserting OEM specific iptables rules.
Kazuhiro Ondo [Thu, 19 Jan 2012 00:10:21 +0000 (16:10 -0800)]
am 4ab46857: Add back hook for inserting OEM specific iptables rules.

* commit '4ab468577647d1ee73810b89d2287eaa5546fecb':
  Add back hook for inserting OEM specific iptables rules.

12 years agoAdd back hook for inserting OEM specific iptables rules.
Kazuhiro Ondo [Thu, 12 Jan 2012 22:15:06 +0000 (16:15 -0600)]
Add back hook for inserting OEM specific iptables rules.

The functionality was lost during merge in ICS branch.
This patch is adding back OEM iptables hook in netd.

Bug:5862460
Change-Id: I9444b8c53e8b84fea2002c2c1d9ba42e45ae5f0c

12 years agoUse <resolv_iface.h> instead of <resolv.h>
David 'Digit' Turner [Fri, 13 Jan 2012 12:43:43 +0000 (13:43 +0100)]
Use <resolv_iface.h> instead of <resolv.h>

The declarations for _resolv_set_default_iface() and others were
initially added to a public C library header (<resolv.h>). This was a
mistake and they have been moved to a private header
(bionic/libc/private/resolv_iface.h)

This patch updates netd to use the correct private header.

Change-Id: I186390ea3675685b4e0dd5b8a099bd21911f059e

12 years agoRename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Steve Block [Fri, 6 Jan 2012 19:18:11 +0000 (19:18 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I8ab66debe4d0c3857a4b80f6f7b6925a352cda87

12 years agoRename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Steve Block [Thu, 5 Jan 2012 23:21:51 +0000 (23:21 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: Ic9a12b3bc322d1fa60de50725b5ca18341d64b91

12 years agoRename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Steve Block [Wed, 4 Jan 2012 20:05:11 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: I61f544fc5b362863886cadceb37c9840e1d48e9b

12 years agoRename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Steve Block [Tue, 20 Dec 2011 16:22:42 +0000 (16:22 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I85b946663d5a0e7606140282bf758c27b8c6f68f

12 years agoam b6331c31: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 15 Dec 2011 00:08:44 +0000 (16:08 -0800)]
am b6331c31: Reconcile with ics-mr1-release

* commit 'b6331c31fede2d6a898892bdf9e9b34618da9756':
  netd: fix argument interpretation bug

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 15 Dec 2011 00:05:55 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release

Change-Id: I95c0b924756d815c89e70c088b6e8003a54226f8

12 years agonetd: fix argument interpretation bug
JP Abgrall [Wed, 14 Dec 2011 23:20:59 +0000 (15:20 -0800)]
netd: fix argument interpretation bug

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

12 years agoam 9e5e0ce6: netd: fix argument interpretation bug
JP Abgrall [Wed, 14 Dec 2011 23:32:55 +0000 (15:32 -0800)]
am 9e5e0ce6: netd: fix argument interpretation bug

* commit '9e5e0ce62e88ddf9a09798eda51b0c270d354c8e':
  netd: fix argument interpretation bug

12 years agoam 9e5e0ce6: netd: fix argument interpretation bug
JP Abgrall [Wed, 14 Dec 2011 23:31:48 +0000 (15:31 -0800)]
am 9e5e0ce6: netd: fix argument interpretation bug

* commit '9e5e0ce62e88ddf9a09798eda51b0c270d354c8e':
  netd: fix argument interpretation bug

12 years agonetd: fix argument interpretation bug
JP Abgrall [Wed, 14 Dec 2011 23:20:59 +0000 (15:20 -0800)]
netd: fix argument interpretation bug

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

12 years agoAllow additional interface flags.
Jeff Sharkey [Thu, 1 Dec 2011 23:25:28 +0000 (15:25 -0800)]
Allow additional interface flags.

Bug: 5686458
Change-Id: I9c5147446636d32bb3a420a05199870cca5f013d

12 years agoRemove square brackets from interface flags.
Jeff Sharkey [Wed, 30 Nov 2011 02:38:14 +0000 (18:38 -0800)]
Remove square brackets from interface flags.

All trailing arguments are treated as now treated as flags, instead
of mixing argument formats.

Change-Id: Iab80ed47ce2c8a1e7bc0fc5a46d391638fe282c8

12 years agoam 063af322: Fix some syntax issues with IP command.
Robert Greenwalt [Wed, 23 Nov 2011 20:16:19 +0000 (12:16 -0800)]
am 063af322: Fix some syntax issues with IP command.

* commit '063af322b48ab1bb0c3e09eb0b64915ba568275b':
  Fix some syntax issues with IP command.

12 years agoam 063af322: Fix some syntax issues with IP command.
Robert Greenwalt [Wed, 23 Nov 2011 20:14:16 +0000 (12:14 -0800)]
am 063af322: Fix some syntax issues with IP command.

* commit '063af322b48ab1bb0c3e09eb0b64915ba568275b':
  Fix some syntax issues with IP command.

12 years agoFix some syntax issues with IP command.
Robert Greenwalt [Fri, 18 Nov 2011 23:32:13 +0000 (15:32 -0800)]
Fix some syntax issues with IP command.

Was not building secondary tables properly.  Also IPv6 host routes
were failing.

bug:5615697
Change-Id: I0d5ad2ed7d13e4d5bd8c2f8ce15fc0ccb36a4690

12 years agonetd: BandwidthController: return extra info on gettetherstats failure
JP Abgrall [Sat, 12 Nov 2011 04:36:16 +0000 (20:36 -0800)]
netd: BandwidthController: return extra info on gettetherstats failure

Use the error message string to report the raw parsed data in case of
failure.

Bug:5543131
Change-Id: If9f3bcea09fd3ab8a506955d8153b3430bfd239c

12 years agoam fc97b82e: Start using IP tool for advanced routing.
Robert Greenwalt [Sat, 5 Nov 2011 19:33:44 +0000 (19:33 +0000)]
am fc97b82e: Start using IP tool for advanced routing.

* commit 'fc97b82e02979f246d56a4bfd60e4aab8686d3f6':
  Start using IP tool for advanced routing.

12 years agoam fc97b82e: Start using IP tool for advanced routing.
Robert Greenwalt [Fri, 4 Nov 2011 22:57:46 +0000 (22:57 +0000)]
am fc97b82e: Start using IP tool for advanced routing.

* commit 'fc97b82e02979f246d56a4bfd60e4aab8686d3f6':
  Start using IP tool for advanced routing.

12 years agoStart using IP tool for advanced routing.
Robert Greenwalt [Wed, 2 Nov 2011 23:48:36 +0000 (16:48 -0700)]
Start using IP tool for advanced routing.

bug:5495862
bug:5396842
Change-Id: I51f21060947f57e63b18c4d35e9d49fac488d48a

12 years agoam f7bf29c8: When un-natting try to do all we can
Robert Greenwalt [Wed, 2 Nov 2011 21:32:24 +0000 (21:32 +0000)]
am f7bf29c8: When un-natting try to do all we can

* commit 'f7bf29c8a37d65e132a4dceb7c5a4200ed5c3d79':
  When un-natting try to do all we can

12 years agoam f7bf29c8: When un-natting try to do all we can
Robert Greenwalt [Wed, 2 Nov 2011 21:30:29 +0000 (21:30 +0000)]
am f7bf29c8: When un-natting try to do all we can

* commit 'f7bf29c8a37d65e132a4dceb7c5a4200ed5c3d79':
  When un-natting try to do all we can

12 years agoWhen un-natting try to do all we can
Robert Greenwalt [Wed, 2 Nov 2011 05:07:28 +0000 (22:07 -0700)]
When un-natting try to do all we can

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

12 years agokeep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Ed Heyl [Fri, 28 Oct 2011 19:06:01 +0000 (19:06 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)

12 years agoundo reset to ics-mr1 until we have a better method
Ed Heyl [Wed, 26 Oct 2011 21:53:28 +0000 (21:53 +0000)]
undo reset to ics-mr1 until we have a better method

12 years agoreset to ics-mr1, but keep history
Ed Heyl [Wed, 26 Oct 2011 18:50:28 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history

12 years agoam 8c61917c: am 54b75b4e: Use CCMP for WPA2 mode
Irfan Sheriff [Wed, 26 Oct 2011 15:24:22 +0000 (08:24 -0700)]
am 8c61917c: am 54b75b4e: Use CCMP for WPA2 mode

* commit '8c61917c11c3b32b37f174265060bb857683ee57':
  Use CCMP for WPA2 mode

12 years agoam 54b75b4e: Use CCMP for WPA2 mode
Irfan Sheriff [Wed, 26 Oct 2011 15:22:47 +0000 (15:22 +0000)]
am 54b75b4e: Use CCMP for WPA2 mode

* commit '54b75b4e772ac77df141ab077be074bc1c098987':
  Use CCMP for WPA2 mode

12 years agoam 3fb42e02: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
Steve Block [Wed, 26 Oct 2011 11:48:23 +0000 (04:48 -0700)]
am 3fb42e02: (-s ours) Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

* commit '3fb42e026ffebab2c8f282e42501040121e32d83':
  Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE