OSDN Git Service

android-x86/system-netd.git
11 years agoFix a TOCTOU and symlink attack in netd.
Robert Greenwalt [Thu, 29 Nov 2012 18:51:33 +0000 (10:51 -0800)]
Fix a TOCTOU and symlink attack in netd.

Bug: 7530471
Change-Id: I01fc79d647831dea903e4b852b874eb7bbed25fb

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 20:19:24 +0000 (12:19 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0a50c89812fb0f6e635a02ed4c9db690d749e3cf

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 21 Sep 2012 14:00:37 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoremove Pan service which is not used anymore.
Zhihai Xu [Wed, 19 Sep 2012 19:13:10 +0000 (12:13 -0700)]
remove Pan service which is not used anymore.

because we replaced bluez bluetooth stack with bluedroid bluetooth stack.
This is multiple project check-in for ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
Pan service depend on system/bluetooth. So both Pan service and system/bluetooth should be removed.

bug 6849488

Change-Id: I7a5a828b9b4327dbd6b6a13ec7ff4a9129ba0ca5

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 12 Sep 2012 14:00:34 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 78b00d81: Merge "Don\'t include <linux/...> header files directly."
jp abgrall [Wed, 12 Sep 2012 04:11:49 +0000 (21:11 -0700)]
am 78b00d81: Merge "Don\'t include <linux/...> header files directly."

* commit '78b00d81ebb7e2720fe17c116bcfd086bdd1f4e7':
  Don't include <linux/...> header files directly.

11 years agoMerge "Don't include <linux/...> header files directly."
jp abgrall [Wed, 12 Sep 2012 03:38:42 +0000 (20:38 -0700)]
Merge "Don't include <linux/...> header files directly."

11 years agoDon't include <linux/...> header files directly.
Elliott Hughes [Wed, 12 Sep 2012 01:56:36 +0000 (18:56 -0700)]
Don't include <linux/...> header files directly.

These change from kernel release to release, and no longer contain some of
the stuff you need.

Change-Id: I3fc7176cf2246aebfc0aa2a833dfa04ea8d931fc

11 years agoDemoting a non-critical error to a warning: unable to load net cmd dll.
Sasha Levitskiy [Tue, 11 Sep 2012 18:04:29 +0000 (11:04 -0700)]
Demoting a non-critical error to a warning: unable to load net cmd dll.

Bug: 7141069
Change-Id: Ib4326f80fd562d845095bad38f45ceb9f3be119e

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 9 Sep 2012 14:01:50 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoAdd LOG_TAG to NetdConstants.
Jeff Sharkey [Thu, 6 Sep 2012 22:45:56 +0000 (15:45 -0700)]
Add LOG_TAG to NetdConstants.

Bug: 7114117
Change-Id: Ifef2cfca6c1361f89ac68eead58df70efc58a8a7

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 21 Aug 2012 13:35:29 +0000 (06:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 8a3da263: Merge "Fix race condition in pthread_create()"
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:29:40 +0000 (10:29 -0700)]
am 8a3da263: Merge "Fix race condition in pthread_create()"

* commit '8a3da263f9fde42efbc54d19465ebd1f83ba35cd':
  Fix race condition in pthread_create()

11 years agoMerge "Fix race condition in pthread_create()"
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:20:10 +0000 (09:20 -0700)]
Merge "Fix race condition in pthread_create()"

11 years agoFix race condition in pthread_create()
Jurijs Oniscuks [Thu, 5 Jul 2012 13:35:05 +0000 (15:35 +0200)]
Fix race condition in pthread_create()

Do not send "&this->mThread" to pthread_create() as newly
created thread can "delete this" before pthread_create() saves
thread id. This would lead to heap corruption.

Change-Id: I9c4cd5e1002b85985514a36ae542778a783db6fb

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 13 Aug 2012 15:10:30 +0000 (08:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoFix idletimer iptable rules.
Haoyu Bai [Thu, 26 Jul 2012 22:36:53 +0000 (15:36 -0700)]
Fix idletimer iptable rules.

Now idletimer should be triggered by every packet.

Cherry-picked from commit 8c54ec5de3818ff0c0cfc735c817be2516454415 in
master. DO NOT MERGE

Change-Id: I48e6fed5cb48edc51b5fbe87091e5dbb3f862cb7

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 6 Aug 2012 13:29:41 +0000 (06:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoChanges the interface command API from static lib to a dynamic one
Sasha Levitskiy [Mon, 30 Jul 2012 23:11:23 +0000 (16:11 -0700)]
Changes the interface command API from static lib to a dynamic one

Change-Id: I9116491a3f5dfc4590ffab367a224fde37a4fd50

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 30 Jul 2012 16:46:15 +0000 (09:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "Fix idletimer iptable rules."
Haoyu Bai [Sat, 28 Jul 2012 00:54:30 +0000 (17:54 -0700)]
Merge "Fix idletimer iptable rules."

11 years agonetd: Add initial interface driver command support
Dmitry Shmidt [Thu, 26 Jul 2012 23:08:02 +0000 (16:08 -0700)]
netd: Add initial interface driver command support

Change-Id: I1d34e43fc6a3336d0cd06e9db1069467382f210f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoFix idletimer iptable rules.
Haoyu Bai [Thu, 26 Jul 2012 22:36:53 +0000 (15:36 -0700)]
Fix idletimer iptable rules.

Now idletimer should be triggered by every packet.

Change-Id: I6c6ea70cb9b37a58dcb0fd8e88df5f987e5ef150

11 years agondc: get rid of arbritrary command length limit
Nick Kralevich [Fri, 20 Jul 2012 01:48:05 +0000 (18:48 -0700)]
ndc: get rid of arbritrary command length limit

Change-Id: I6123aa916a1f69bbfba58c26e6f150dfdec8c991

11 years agoMerge "Changed format of interface class acitivity message."
Haoyu Bai [Tue, 17 Jul 2012 23:53:40 +0000 (16:53 -0700)]
Merge "Changed format of interface class acitivity message."

11 years agoMerge "Introduce basic firewall controls."
Jeff Sharkey [Tue, 17 Jul 2012 21:05:56 +0000 (14:05 -0700)]
Merge "Introduce basic firewall controls."

11 years agoIntroduce basic firewall controls.
Jeff Sharkey [Sat, 14 Jul 2012 01:04:07 +0000 (18:04 -0700)]
Introduce basic firewall controls.

Creates a separate firewall chain that can be used to allow/deny
traffic based on rules.

Firewall is disabled by default.  When enabled, it supports four
types of rules: allowing traffic based on iface name, based on egress
source IP, based on egress destination IP and port, and based on
local UID.

Bug: 5756357
Change-Id: I97f894dca6bddb93b3c56478c5297f79d727cdab

11 years agoChanged format of interface class acitivity message.
Haoyu Bai [Tue, 17 Jul 2012 17:32:58 +0000 (10:32 -0700)]
Changed format of interface class acitivity message.

For the sake of consistency, format of interface class activity message
is changed to "NNN IfaceClass <active/idle> <label>" and using single
response code for interface class activity.

Change-Id: I34dc5c37cc611d05172060b2a1e4ceac0a0f0588

11 years agoHACK: Need to startup dhcpd for non-system bluetooth stack
Matthew Xie [Thu, 12 Jul 2012 23:42:07 +0000 (16:42 -0700)]
HACK: Need to startup dhcpd for non-system bluetooth stack

Add TODO comments to remove start/stopReverseTethering
Return error code with exit() in child process in startReverseTethering
when executing dhcpcd fails.
This is needed so we can get BT certification.
The cleanup is tracked in stopship b/6820232

Change-Id: I98a1c8aedfa042b1824de7d8c69f2600c9bfcf29

11 years agochange logx to alogx
Matthew Xie [Thu, 21 Jun 2012 20:40:02 +0000 (13:40 -0700)]
change logx to alogx

Change-Id: Ib535b04a6b18d5d35012795b07a705c6483f343d

11 years agoAdded bluetooth reverse tether start/stop cmd
zzy [Sun, 15 Apr 2012 00:24:24 +0000 (17:24 -0700)]
Added bluetooth reverse tether start/stop cmd

11 years agoConsolidate iptables chain management.
Jeff Sharkey [Fri, 13 Jul 2012 01:32:03 +0000 (18:32 -0700)]
Consolidate iptables chain management.

Move creation and management of module iptables chains up into
CommandListener, which gives better visibility into ordering.

Change-Id: If0c94187c6e59a20840b035d7241057f45a0f74b

12 years agoMerge "Add a class lable parameter to idletimer."
Haoyu Bai [Fri, 29 Jun 2012 22:06:19 +0000 (15:06 -0700)]
Merge "Add a class lable parameter to idletimer."

12 years agoAdd a class lable parameter to idletimer.
Haoyu Bai [Thu, 28 Jun 2012 23:16:51 +0000 (16:16 -0700)]
Add a class lable parameter to idletimer.

Now the idletimer should be setup by this command:
ndc idletimer add <interface> <timeout> <class label>

Class label can be a number or string to identify device type, such as
mobile or wifi. Idletimer will send label in the netd message instead
of the actual interface name.

Change-Id: Ic8b69dc5e38a4436c74723697905643a1214aa2a

12 years agonetd: interface: Allow setcfg command without addresses
Dmitry Shmidt [Wed, 20 Jun 2012 19:59:21 +0000 (12:59 -0700)]
netd: interface: Allow setcfg command without addresses

Change-Id: I47ebe05b2f3daf9754b4baf2e62d46dea76f67b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
12 years agoMerge "Clean up softap interface"
Irfan Sheriff [Wed, 20 Jun 2012 00:42:56 +0000 (17:42 -0700)]
Merge "Clean up softap interface"

12 years agoClean up softap interface
Irfan Sheriff [Fri, 15 Jun 2012 23:11:31 +0000 (16:11 -0700)]
Clean up softap interface

Remove old IOCTL based interface

Change-Id: I5c46964d025848ce8a0e0195ff213ccd8b33d508

12 years agoam 9997f9a3: resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp
Jean-Baptiste Queru [Fri, 15 Jun 2012 00:09:03 +0000 (17:09 -0700)]
am 9997f9a3: resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp

* commit '9997f9a3edac2baac244c2fe8e49685a3be9f482':
  Run dnsmasq with options --keep-in-foreground and --pid-file.

12 years agoresolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:34:31 +0000 (15:34 -0700)]
resolved conflicts for merge of e36a3a2f to jb-dev-plus-aosp

Change-Id: I566b0e96327f318313c17a11d35539554b075f59

12 years agoMerge "Run dnsmasq with options --keep-in-foreground and --pid-file."
Jean-Baptiste Queru [Thu, 14 Jun 2012 20:12:30 +0000 (13:12 -0700)]
Merge "Run dnsmasq with options --keep-in-foreground and --pid-file."

12 years agoam c9ed2f47: (-s ours) Allow additional interface flags. Do not merge
Jeff Sharkey [Mon, 4 Jun 2012 21:01:44 +0000 (14:01 -0700)]
am c9ed2f47: (-s ours) Allow additional interface flags. Do not merge

* commit 'c9ed2f4706fa46e41a6ebbcd9a529d75c1ac84c5':
  Allow additional interface flags. Do not merge

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

Cherry-pick from master to fix b/6537483

Bug: 5686458
Change-Id: I9c5147446636d32bb3a420a05199870cca5f013d

12 years agoam 034ed176: Reconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:46:25 +0000 (08:46 -0700)]
am 034ed176: Reconcile with jb-release nakasi-factoryrom-release

* commit '034ed1763cf10f060f73d10ee6b4abef896fc3ef':
  Do not send extra data the client is not consuming.

12 years agoReconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:41:17 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I51d86c45479eb7be5e06325d344a6d1c21fd5247

12 years agoam 40baed83: netd: NetlinkHandler: explicitly ignore "platform" and "backlight" events
JP Abgrall [Wed, 9 May 2012 17:11:30 +0000 (10:11 -0700)]
am 40baed83: netd: NetlinkHandler: explicitly ignore "platform" and "backlight" events

* commit '40baed83f89e8d8f834cdfa94d0615076463c04b':
  netd: NetlinkHandler: explicitly ignore "platform" and "backlight" events

12 years agoam 29e8de22: BandwidthController: Fix double counting
JP Abgrall [Wed, 9 May 2012 17:11:29 +0000 (10:11 -0700)]
am 29e8de22: BandwidthController: Fix double counting

* commit '29e8de22ad806bdcaa971ffeeb360c9f908aa346':
  BandwidthController: Fix double counting

12 years agoam b1d24094: BandwidthController: Avoid setting a uid multiple times in NaughtyApps
JP Abgrall [Wed, 9 May 2012 17:11:29 +0000 (10:11 -0700)]
am b1d24094: BandwidthController: Avoid setting a uid multiple times in NaughtyApps

* commit 'b1d24094c2c5d48bbb3dfad4a0551ff0bf77ce6c':
  BandwidthController: Avoid setting a uid multiple times in NaughtyApps

12 years agoam f66d6e9d: BandwidthController: hookup qtaguid for tracking closest to devices.
JP Abgrall [Wed, 9 May 2012 17:11:28 +0000 (10:11 -0700)]
am f66d6e9d: BandwidthController: hookup qtaguid for tracking closest to devices.

* commit 'f66d6e9db6be3e94b80c59fab99e237d2e2968c5':
  BandwidthController: hookup qtaguid for tracking closest to devices.

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 9 May 2012 14:47:36 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev

12 years agonetd: NetlinkHandler: explicitly ignore "platform" and "backlight" events
JP Abgrall [Tue, 8 May 2012 21:48:45 +0000 (14:48 -0700)]
netd: NetlinkHandler: explicitly ignore "platform" and "backlight" events

The new vsync api uses uevents to notify userspace... 60 events/sec. :(
Don't log unexpected event's subsystem if it is one of the known ones.

Change-Id: Ie900898b326c9451b76ac5f6ba047870fd62093a

12 years agoRun dnsmasq with options --keep-in-foreground and --pid-file.
Peter Nilsson [Thu, 8 Sep 2011 16:48:31 +0000 (09:48 -0700)]
Run dnsmasq with options --keep-in-foreground and --pid-file.

Tell dnsmasq to run with option --keep-in-foreground instead
of --no-daemon, which is meant for debug purposes only. Also
use option --pid-file to tell dnsmasq not use a pid file.

Change-Id: I82858d911e94407b2511d8ce8388be553f2f09f6

12 years agoBandwidthController: Fix double counting
JP Abgrall [Thu, 3 May 2012 19:52:15 +0000 (12:52 -0700)]
BandwidthController: Fix double counting

Only have qtaguid only count in the bw_INPUT/bw_OUTPUT chains
and not in the costly_* subchains.
We don't use --goto anymore.

Change-Id: I2eded2e0fa12b46843d32e74406cfeda85f242d1

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 30 Apr 2012 14:06:08 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam e07effe6: netd: Netlink: Use KOBJECT_UEVENT instead of IDLETIMER
JP Abgrall [Fri, 27 Apr 2012 19:51:23 +0000 (12:51 -0700)]
am e07effe6: netd: Netlink: Use KOBJECT_UEVENT instead of IDLETIMER

* commit 'e07effe6f8e9340dbee9428b29672adfb647c413':
  netd: Netlink: Use KOBJECT_UEVENT instead of IDLETIMER

12 years agoam ad729ac1: bandwidthcontroller: hide iptables errors when they don\'t matter
JP Abgrall [Fri, 27 Apr 2012 19:51:17 +0000 (12:51 -0700)]
am ad729ac1: bandwidthcontroller: hide iptables errors when they don\'t matter

* commit 'ad729ac11e080b1f1bdd9cd32807d9ae74ce2a63':
  bandwidthcontroller: hide iptables errors when they don't matter

12 years agoam e4c501c3: netd: NatController: don\'t setup iptables hooks in constructor.
JP Abgrall [Fri, 27 Apr 2012 19:51:11 +0000 (12:51 -0700)]
am e4c501c3: netd: NatController: don\'t setup iptables hooks in constructor.

* commit 'e4c501c3a78f21d6d6e4ff0ba9090185cff1be8c':
  netd: NatController: don't setup iptables hooks in constructor.

12 years agoBandwidthController: Avoid setting a uid multiple times in NaughtyApps
JP Abgrall [Fri, 27 Apr 2012 08:02:31 +0000 (01:02 -0700)]
BandwidthController: Avoid setting a uid multiple times in NaughtyApps

Use the naughtyAppUids list before inserting a new app.

Bug: 6292513
Change-Id: I6726b7d589569a6198b8a0ff32c32c0e40ed5319

12 years agoBandwidthController: hookup qtaguid for tracking closest to devices.
JP Abgrall [Fri, 27 Apr 2012 07:22:57 +0000 (00:22 -0700)]
BandwidthController: hookup qtaguid for tracking closest to devices.

Before, qtaguid would rely on netdev (up/down) callbacks to read out the
dev rx/tx stats.
Now it uses (raw) PREROUTING and (mangle) POSTROUTING iptable hooks.
We use mangle on the out path because nat is not available in ipv6.
The NatController only masquerades in nat POSTROUTING so we don't count
traffic that might get dropped.

Bug: 5444089
Change-Id: I997b8b3c81264a545f1f575baaf0445c0afc8f72

12 years agonetd: Netlink: Use KOBJECT_UEVENT instead of IDLETIMER
JP Abgrall [Fri, 27 Apr 2012 07:02:53 +0000 (00:02 -0700)]
netd: Netlink: Use KOBJECT_UEVENT instead of IDLETIMER

The initial idletimer support required using NETLINK_IDLETIMER
netlink socket type.
Instead we now just re-use the existing KOBJECT_UEVENT socket.

Change-Id: I951f2f29182c7cf7f29a054a0eabc88dc25f6d1f

12 years agobandwidthcontroller: hide iptables errors when they don't matter
JP Abgrall [Wed, 25 Apr 2012 06:27:44 +0000 (23:27 -0700)]
bandwidthcontroller: hide iptables errors when they don't matter

Some commands are run to be able to recover after failures.
Those cleanup commands are generally allowed to fail.
But the lower level system commands would log an error.
Now that error is hidden if nobody will care about the result.
A "#define LOG_NDEBUG 0" will show those failing commands.

Removed leftover LOG_NDEBUG in CommandListener.

Bug: 6377175
Change-Id: I1205fb077f7d0496969bd2a0b5da42025bc5a8dc

12 years agonetd: NatController: don't setup iptables hooks in constructor.
JP Abgrall [Wed, 25 Apr 2012 04:30:43 +0000 (21:30 -0700)]
netd: NatController: don't setup iptables hooks in constructor.

iptables top-level chain updates should happen within CommandListener()
when it invokes the various modules' setupIptablesHooks().
And remove the extra DROP rule.

Change-Id: I33d2cfbd5444516f855ff85152c472352944cc77

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Apr 2012 14:50:05 +0000 (07:50 -0700)]
merge in jb-release history after reset to jb-dev

12 years agobandwidthcontroller: hide iptables errors when they don't matter
JP Abgrall [Wed, 25 Apr 2012 06:27:44 +0000 (23:27 -0700)]
bandwidthcontroller: hide iptables errors when they don't matter

Some commands are run to be able to recover after failures.
Those cleanup commands are generally allowed to fail.
But the lower level system commands would log an error.
Now that error is hidden if nobody will care about the result.
A "#define LOG_NDEBUG 0" will show those failing commands.

Removed leftover LOG_NDEBUG in CommandListener.

Bug: 6377175
Change-Id: I1205fb077f7d0496969bd2a0b5da42025bc5a8dc

12 years agonetd: NatController: don't setup iptables hooks in constructor.
JP Abgrall [Wed, 25 Apr 2012 04:30:43 +0000 (21:30 -0700)]
netd: NatController: don't setup iptables hooks in constructor.

iptables top-level chain updates should happen within CommandListener()
when it invokes the various modules' setupIptablesHooks().
And remove the extra DROP rule.

Change-Id: I33d2cfbd5444516f855ff85152c472352944cc77

12 years agoMerge "Store certain MDNS fields as quoted strings"
Robert Greenwalt [Tue, 24 Apr 2012 16:54:38 +0000 (09:54 -0700)]
Merge "Store certain MDNS fields as quoted strings"

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 23 Apr 2012 14:08:15 +0000 (07:08 -0700)]
merge in jb-release history after reset to master

12 years agoStore certain MDNS fields as quoted strings
Robert Greenwalt [Fri, 20 Apr 2012 21:22:54 +0000 (14:22 -0700)]
Store certain MDNS fields as quoted strings

They sometimes contain spaces so a space-delimited response requires more care.

bug: 6353048
Change-Id: I84d5cc156bf4d9f1419b7202e9aa00ddb7209b2f

12 years agonetd: Idletimer vs Nat vs Bandwidth controllers
JP Abgrall [Tue, 17 Apr 2012 23:38:23 +0000 (16:38 -0700)]
netd: Idletimer vs Nat vs Bandwidth controllers

* modified iptables users to work in controller specific custom chains.
 - each controller only works withing his own custom chains and not the
  top level ones (INPUT, OUTPUT, FORWARD, POSTROUTING,...)
 - CommandListener now invokes setupIptablesHooks() for each controller
   once. That is the only time they are allowed to access the top-level
   chains.

* Added idletimer controller.
  From https://android-git.corp.google.com/g/#/c/180769/2
 - supported commands
   . ndc idletimer enable
   . ndc idletimer add <iface> <timeout>
   . ndc idletimer remove <iface> <timeout_used_during_add>
 There is a framework change elsewhere that receives netlink messages.

Signed-off-by: Ashish Sharma <ashishsharma@google.com>
Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: Ia57450c09166ce20f21d1e3b49047ef1e98f2a3d

12 years agoAdd "metered" flag to DHCP offer vendor info.
Jeff Sharkey [Thu, 19 Apr 2012 04:53:35 +0000 (21:53 -0700)]
Add "metered" flag to DHCP offer vendor info.

Bug: 6344821
Change-Id: Ic8cd235a1cbdd848ff839f6f0f03161de2090751

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 16 Apr 2012 14:06:29 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

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 agomerge in jb-release history after reset to master
The Android Automerger [Wed, 21 Mar 2012 14:06:19 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

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 jb-release history after reset to master
The Android Automerger [Mon, 12 Mar 2012 14:06:54 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

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 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.