OSDN Git Service
Sreeram Ramachandran [Fri, 11 Apr 2014 02:58:06 +0000 (19:58 -0700)]
Implement permissions set/clear for both networks and users.
(cherry picked from commit
47a0fa0ad402704b639fbc2868c55adc432bb6ea)
Change-Id: Ibb71025e1e2c72bd300fb7379d5ab54da4a6982e
Lorenzo Colitti [Fri, 11 Apr 2014 09:26:17 +0000 (18:26 +0900)]
Move sprintf statements to getRouteTableForInterface.
(cherry picked from commit
b45648ad5902e53f433615ab1a0268927b6a328e)
Change-Id: Ie0b2c3e3688285068b70e96d1153c0b105548a00
Sreeram Ramachandran [Fri, 11 Apr 2014 02:37:59 +0000 (19:37 -0700)]
Cleanup: Minor style fixes.
(cherry picked from commit
49d905456fd6cf730abdddb49df84d6032b0a419)
Change-Id: I199447f03ce33d79007e62e23ccf683ed4249f97
Sreeram Ramachandran [Thu, 10 Apr 2014 19:10:24 +0000 (12:10 -0700)]
Set kernel proc files for fwmark reflection and table numbers for RAs.
(cherry picked from commit
75992274574e91c9a17aad5b60f0c2b710cd31b9)
Change-Id: I5f0d759cb9b8590555af7f5503f00d3e455ece54
Sreeram Ramachandran [Mon, 7 Apr 2014 21:10:04 +0000 (14:10 -0700)]
Implement network create/destroy.
(cherry picked from commit
382fc20107aa38cca062f10b4bc05c47b6c7f191)
Change-Id: Id5f8df447d812c8e8cf03addbb5e70abdcdfceb9
Sreeram Ramachandran [Thu, 27 Mar 2014 01:33:47 +0000 (18:33 -0700)]
Introduce Netd APIs for multinetworks.
Just stubs for now. Implementation will follow in subsequent CLs.
Change-Id: I10a2e4aca594c10a26d58afb4c250141386d3f0f
(cherry picked from commit
0d5146bed37b4e5b6909617e5f958a66bfee1e48)
Nick Kralevich [Thu, 1 May 2014 22:41:29 +0000 (22:41 +0000)]
am
551e5b47: am
553dc723: BandwidthController: validate interface / chain names
* commit '
551e5b47a21294cf775f8effbb6f2bf34c664164':
BandwidthController: validate interface / chain names
Nick Kralevich [Thu, 1 May 2014 22:38:20 +0000 (22:38 +0000)]
am
553dc723: BandwidthController: validate interface / chain names
* commit '
553dc723163798720bf59d452688ad0ae946b29e':
BandwidthController: validate interface / chain names
Nick Kralevich [Thu, 1 May 2014 20:10:45 +0000 (13:10 -0700)]
BandwidthController: validate interface / chain names
Only allow alphanumeric, dashes, underscores, or colons in
interface and chain names. First character must be alphanumeric.
Bug:
14320836
Bug:
14323009
Change-Id: Ieac729719d0f9038f60c7afcb327f17d292d6ca6
(cherry picked from commit
0b2b9021ee27af2449c433fa13ed5c57e55dd816)
Nick Kralevich [Thu, 1 May 2014 20:10:45 +0000 (13:10 -0700)]
BandwidthController: validate interface / chain names
Only allow alphanumeric, dashes, underscores, or colons in
interface and chain names. First character must be alphanumeric.
Bug:
14320836
Bug:
14323009
Change-Id: Ieac729719d0f9038f60c7afcb327f17d292d6ca6
Bill Yi [Wed, 30 Apr 2014 12:50:58 +0000 (12:50 +0000)]
am
47939704: am
428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master
* commit '
479397047075e236af9b23848371aa302d95c213':
Bill Yi [Wed, 30 Apr 2014 01:13:18 +0000 (01:13 +0000)]
am
428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master
* commit '
428c861a8e8aed4aa3224bd8d18211c9e6ca1c64':
Bill Yi [Tue, 29 Apr 2014 22:30:33 +0000 (15:30 -0700)]
Merge klp-dev-plus-aosp into stage-aosp-master
Change-Id: I1c46e9613eb7638531b6abffee43ffc94b116018
Robert Greenwalt [Tue, 22 Apr 2014 21:43:01 +0000 (21:43 +0000)]
am
e4f22d3c: am
6aac1ccd: Merge "system: netd: prevent infinite loop"
* commit '
e4f22d3cfc4f8826d27e81f9a87d653ef505b5b7':
system: netd: prevent infinite loop
Robert Greenwalt [Tue, 22 Apr 2014 21:36:41 +0000 (21:36 +0000)]
am
6aac1ccd: Merge "system: netd: prevent infinite loop"
* commit '
6aac1ccd09d590b014566b4000e7f908cc11e9de':
system: netd: prevent infinite loop
Robert Greenwalt [Tue, 22 Apr 2014 20:51:58 +0000 (20:51 +0000)]
Merge "system: netd: prevent infinite loop"
Sasha Levitskiy [Mon, 21 Apr 2014 19:35:12 +0000 (19:35 +0000)]
am
27f0697e: am
2e6b5f77: Merge "Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a proper lib version."
* commit '
27f0697e654a7e5126e5633bf825a2178f3872e6':
Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a proper lib version.
Sasha Levitskiy [Mon, 21 Apr 2014 19:32:41 +0000 (19:32 +0000)]
am
2e6b5f77: Merge "Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a proper lib version."
* commit '
2e6b5f774d26048f0d3e70ae4bfe65f80a5ea1dd':
Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a proper lib version.
Sasha Levitskiy [Mon, 21 Apr 2014 19:25:10 +0000 (19:25 +0000)]
Merge "Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a proper lib version."
Robert Greenwalt [Mon, 21 Apr 2014 18:43:18 +0000 (18:43 +0000)]
am
ae7e21b3: am
d76c8c9c: Merge "Fix for DNS resolutions when there is no default network set yet. We need to determine the actual netId to use prior to comparing it against the default netId. Also initialize the default network variable."
* commit '
ae7e21b37f2f196dc2c8b4732b65c6329ec2fae5':
Fix for DNS resolutions when there is no default network set yet. We need to determine the actual netId to use prior to comparing it against the default netId. Also initialize the default network variable.
Robert Greenwalt [Mon, 21 Apr 2014 18:41:08 +0000 (18:41 +0000)]
am
d76c8c9c: Merge "Fix for DNS resolutions when there is no default network set yet. We need to determine the actual netId to use prior to comparing it against the default netId. Also initialize the default network variable."
* commit '
d76c8c9c66581f310f3d1333405bdcc7fb9c5fb2':
Fix for DNS resolutions when there is no default network set yet. We need to determine the actual netId to use prior to comparing it against the default netId. Also initialize the default network variable.
Robert Greenwalt [Mon, 21 Apr 2014 18:31:32 +0000 (18:31 +0000)]
Merge "Fix for DNS resolutions when there is no default network set yet. We need to determine the actual netId to use prior to comparing it against the default netId. Also initialize the default network variable."
Sasha Levitskiy [Mon, 21 Apr 2014 18:03:56 +0000 (11:03 -0700)]
Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a proper lib version.
Change-Id: I3604b0610c6aadeaaac7bd970b3d3d190111f0dd
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Paul Jensen [Thu, 17 Apr 2014 19:02:32 +0000 (15:02 -0400)]
Fix for DNS resolutions when there is no default network set yet.
We need to determine the actual netId to use prior to comparing
it against the default netId. Also initialize the default network
variable.
bug:
13877665
Change-Id: I24c05eb006e2c93d5e0a9b94fee4da408089d2b8
Paul Jensen [Thu, 17 Apr 2014 17:35:33 +0000 (13:35 -0400)]
Fix for DNS resolutions when there is no default network set yet.
We need to determine the actual netId to use prior to comparing
it against the default netId. Also initialize the default network
variable.
bug:
13877665
Change-Id: I24c05eb006e2c93d5e0a9b94fee4da408089d2b8
Paul Jensen [Fri, 4 Apr 2014 04:04:39 +0000 (00:04 -0400)]
Fix build break after
a0efaec
Change-Id: Ie8c77a53a3daeef61527ba4544cae417ade16fef
Paul Jensen [Fri, 4 Apr 2014 03:11:45 +0000 (23:11 -0400)]
resolved conflicts for merge of
5b49ab9e to master
Change-Id: Ib252e3630c5e3b8a38405fc33b147ad365492946
Paul Jensen [Thu, 3 Apr 2014 23:06:00 +0000 (19:06 -0400)]
resolved conflicts for merge of
45d7b748 to klp-modular-dev-plus-aosp
Change-Id: I924e2c3c654501034dfa7429c0a54d0462fc1571
Robert Greenwalt [Thu, 3 Apr 2014 17:05:41 +0000 (17:05 +0000)]
Merge "netd: Replace iface with opaque netid in resolver."
Kenneth Tateno [Mon, 10 Mar 2014 21:37:30 +0000 (14:37 -0700)]
system: netd: prevent infinite loop
There is a corner case where rescan() runs between
allocateServiceRef and startMonitoring. After
allocateServiceRef is called the node at mHead
has mReady = 0. Then when rescan runs, it loops forver
waiting for mReady != 0, but startMonitoring can't
run because rescan has the lock.
To prevent this, allow rescan to continue to the
next node if mReady == 0.
Change-Id: I7538e00087c02cd6b5553c992bd3c14e1a867a99
Szymon Jakubczak [Fri, 14 Feb 2014 22:09:43 +0000 (17:09 -0500)]
netd: Replace iface with opaque netid in resolver.
Also ensure that UID mapping (for VPN) cannot be overridden by
android_getaddrinfofornet or per-PID preference.
Change-Id: I9ccfda2902cc0943e87c9bc346ad9a2578accdab
Mark Salyzyn [Thu, 27 Mar 2014 00:17:41 +0000 (00:17 +0000)]
am
5faac35c: am
57abed1d: Merge "netd: SCN must be used instead of PRI for scanf functions"
* commit '
5faac35cc84bae8c96775a5bc9026012378d6fd4':
netd: SCN must be used instead of PRI for scanf functions
Mark Salyzyn [Thu, 27 Mar 2014 00:10:36 +0000 (00:10 +0000)]
am
57abed1d: Merge "netd: SCN must be used instead of PRI for scanf functions"
* commit '
57abed1d8463b20a28745894d99942bfa9512e1b':
netd: SCN must be used instead of PRI for scanf functions
Mark Salyzyn [Wed, 26 Mar 2014 23:09:03 +0000 (23:09 +0000)]
Merge "netd: SCN must be used instead of PRI for scanf functions"
Mark Salyzyn [Wed, 26 Mar 2014 21:15:03 +0000 (14:15 -0700)]
netd: SCN must be used instead of PRI for scanf functions
Change-Id: I2503fe09e4f90e8339e2b666924f89b33f297af5
Chad Brubaker [Mon, 24 Mar 2014 21:08:15 +0000 (21:08 +0000)]
am
294f66f5: am
92ceda97: am
f7635e29: Merge "Move VPN routing decisions from iptables to ip" into klp-dev
* commit '
294f66f5582b0456f5c2ba20b9170644363b46a7':
Move VPN routing decisions from iptables to ip
Chad Brubaker [Mon, 24 Mar 2014 19:35:26 +0000 (19:35 +0000)]
am
41bec8e5: am
803e8d85: am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
41bec8e5b517c189df908193c4cb6b5b0abdb709':
Allow overlap in UidMarkMap
Chad Brubaker [Mon, 24 Mar 2014 19:35:25 +0000 (19:35 +0000)]
am
4fe6d792: am
6b9ae17f: am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
4fe6d7923802d463a650b1f2b89dd85a008ca868':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Mon, 24 Mar 2014 17:27:15 +0000 (17:27 +0000)]
am
c7c348d7: am
406edcfd: am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
c7c348d7cad39f06e8e9454f6128a5911d5fdb10':
Mark uids without rules with PROTECT_MARK
Chad Brubaker [Sat, 22 Mar 2014 09:31:00 +0000 (09:31 +0000)]
am
92ceda97: am
f7635e29: Merge "Move VPN routing decisions from iptables to ip" into klp-dev
* commit '
92ceda97cd153f6bee3db04cd0b6d93f32a12551':
Move VPN routing decisions from iptables to ip
Chad Brubaker [Sat, 22 Mar 2014 04:08:56 +0000 (04:08 +0000)]
am
f7635e29: Merge "Move VPN routing decisions from iptables to ip" into klp-dev
* commit '
f7635e290be7bf427736f3849981f12369dd5215':
Move VPN routing decisions from iptables to ip
Chad Brubaker [Sat, 22 Mar 2014 00:03:25 +0000 (00:03 +0000)]
am
f7635e29: Merge "Move VPN routing decisions from iptables to ip" into klp-dev
* commit '
f7635e290be7bf427736f3849981f12369dd5215':
Move VPN routing decisions from iptables to ip
Chad Brubaker [Fri, 21 Mar 2014 23:33:18 +0000 (23:33 +0000)]
Merge "Move VPN routing decisions from iptables to ip" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 23:09:25 +0000 (23:09 +0000)]
am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
e287d24e9cfd6ed84bdb69a82b6f8357de2fee34':
Allow overlap in UidMarkMap
Chad Brubaker [Fri, 21 Mar 2014 23:09:25 +0000 (23:09 +0000)]
am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
954d5d1bcdcdfe4522a64ae48827501a6a6d64c0':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Fri, 21 Mar 2014 21:09:45 +0000 (21:09 +0000)]
am
803e8d85: am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
803e8d85f3b78f06288d4651cd814f3f05fdcebe':
Allow overlap in UidMarkMap
Chad Brubaker [Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)]
am
6b9ae17f: am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
6b9ae17f88919417991147eba90e7c021e062737':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Fri, 21 Mar 2014 21:02:49 +0000 (21:02 +0000)]
am
e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev
* commit '
e287d24e9cfd6ed84bdb69a82b6f8357de2fee34':
Allow overlap in UidMarkMap
Chad Brubaker [Fri, 21 Mar 2014 21:02:48 +0000 (21:02 +0000)]
am
954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into klp-dev
* commit '
954d5d1bcdcdfe4522a64ae48827501a6a6d64c0':
Update clearifaceforuidrange to take the interface
Chad Brubaker [Fri, 21 Mar 2014 20:51:59 +0000 (20:51 +0000)]
Merge "Allow overlap in UidMarkMap" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:51:51 +0000 (20:51 +0000)]
Merge "Update clearifaceforuidrange to take the interface" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 17:48:17 +0000 (17:48 +0000)]
am
406edcfd: am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
406edcfde29342be37cbbb326e1b9c4697236cd2':
Mark uids without rules with PROTECT_MARK
Chad Brubaker [Fri, 21 Mar 2014 17:43:59 +0000 (17:43 +0000)]
am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
2a390120a9e90ec414d347921039ff98724d0dda':
Mark uids without rules with PROTECT_MARK
Chad Brubaker [Fri, 21 Mar 2014 17:43:48 +0000 (17:43 +0000)]
am
2a390120: Mark uids without rules with PROTECT_MARK
* commit '
2a390120a9e90ec414d347921039ff98724d0dda':
Mark uids without rules with PROTECT_MARK
JP Abgrall [Tue, 18 Mar 2014 02:13:48 +0000 (02:13 +0000)]
am
1f1f159f: am
cfb7ebe1: Merge "Fix C++11 violations"
* commit '
1f1f159fdfb0512ddca6221a091805a85b4429f1':
Fix C++11 violations
JP Abgrall [Tue, 18 Mar 2014 02:09:27 +0000 (02:09 +0000)]
am
cfb7ebe1: Merge "Fix C++11 violations"
* commit '
cfb7ebe1b2dfd31b408f6aa6e3f3fcdf89baa6c4':
Fix C++11 violations
JP Abgrall [Tue, 18 Mar 2014 02:08:54 +0000 (02:08 +0000)]
am
cfb7ebe1: Merge "Fix C++11 violations"
* commit '
cfb7ebe1b2dfd31b408f6aa6e3f3fcdf89baa6c4':
Fix C++11 violations
JP Abgrall [Tue, 18 Mar 2014 02:03:43 +0000 (02:03 +0000)]
Merge "Fix C++11 violations"
SynergyDev [Sun, 16 Mar 2014 22:48:51 +0000 (15:48 -0700)]
Fix C++11 violations
The C++11 standard requires a space between literals and identifiers
Chad Brubaker [Mon, 24 Feb 2014 23:45:10 +0000 (15:45 -0800)]
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
Chad Brubaker [Mon, 24 Feb 2014 23:41:35 +0000 (15:41 -0800)]
Update clearifaceforuidrange to take the interface
resolv's uid range=>iface map now allows overlap in uid ranges to support
simultaneous tuns. _resolv_clear_iface_for_uid_range now takes the
interface to support removing only one of the rules.
Bug:
12134439
Change-Id: I3e2a167875bbd381846d5c47d7b34c625abfb2e0
Chad Brubaker [Thu, 6 Feb 2014 21:38:41 +0000 (13:38 -0800)]
Move VPN routing decisions from iptables to ip
Routes are now encoded by ip rules that send connections to the Vpn
table if the connection is marked and the destination falls into a
route. This differs from the previous design where a mark meant that
the connection must go over the VPN, now a mark simply means that it
may.
Bug:
12549060
Change-Id: I9be7e27a0f46858f109d8bc5c5bced309b05201a
Chad Brubaker [Thu, 20 Feb 2014 01:51:05 +0000 (17:51 -0800)]
Mark uids without rules with PROTECT_MARK
The default result for a uid without a mark should be MARK_PROTECT
because the service using the uid's mark may be covered by a VPN that
should not cover the user it is acting for.
Bug:
12608570
Change-Id: I2402cb86ddb2fe6e670d1793263ff6c2c31d32fe
Ruchi Kandoi [Wed, 12 Mar 2014 01:00:44 +0000 (18:00 -0700)]
netd: Add support for timestamp in idletimer netlink notification.
Change-Id: I77e9052e988d65c6b543441a8f03876bcd7c15ce
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Calin Juravle [Tue, 11 Mar 2014 18:29:07 +0000 (18:29 +0000)]
am
491086e5: Merge "Changed path to the private dns headers Bug:
13219633"
* commit '
491086e5f523b5ae86734e135dd8685499c954fa':
Changed path to the private dns headers Bug:
13219633
Calin Juravle [Tue, 4 Mar 2014 17:55:44 +0000 (17:55 +0000)]
am
a86f2b6c: am
491086e5: Merge "Changed path to the private dns headers Bug:
13219633"
* commit '
a86f2b6c761954b978b3c8346d1040efca8d1ec6':
Changed path to the private dns headers Bug:
13219633
Calin Juravle [Tue, 4 Mar 2014 17:14:55 +0000 (17:14 +0000)]
am
491086e5: Merge "Changed path to the private dns headers Bug:
13219633"
* commit '
491086e5f523b5ae86734e135dd8685499c954fa':
Changed path to the private dns headers Bug:
13219633
Calin Juravle [Tue, 4 Mar 2014 14:26:32 +0000 (14:26 +0000)]
Merge "Changed path to the private dns headers Bug:
13219633"
Calin Juravle [Tue, 4 Mar 2014 12:16:06 +0000 (12:16 +0000)]
Changed path to the private dns headers
Bug:
13219633
Change-Id: Ia7f3da59925621b449bacfeb220ab8f8e3be8d88
Christopher Lane [Mon, 3 Mar 2014 23:28:26 +0000 (23:28 +0000)]
am
c0bc14a3: Add support for custom TXT records
* commit '
c0bc14a3c2f0efe1f368f2120de38e99ccb6d9f0':
Add support for custom TXT records
Christopher Lane [Wed, 26 Feb 2014 03:08:58 +0000 (19:08 -0800)]
Add support for custom TXT records
This isn't supported higher up in the stack yet, so use command line to test.
E.g. "ndc mdns mdnssd register 4 Kitten _kitten._tcp 4242 sound=meow color=pink"
Change-Id: I261c17465ae677f91a289077b6e363a149c94c3e
Ashish Sharma [Wed, 12 Feb 2014 19:53:00 +0000 (11:53 -0800)]
NetlinkHandler: Revert the special handling of event param name.
The kernel change was reverted to remain consistent with past API.
Change-Id: I60a539aaf3bd78a56ab54391685f6aaf07de19ce
Ashish Sharma [Tue, 4 Feb 2014 01:28:04 +0000 (17:28 -0800)]
Initialize IDLETIMER iptables rules for ipv6.
Bug:
12845905
Change-Id: I28f460766a29f0ca4386c8064ffe52c39f907084
Colin Cross [Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)]
am
19d49454: am
2bd389e3: Merge "AArch64: Fix printf format strings."
* commit '
19d494543311f5a51983f82d2a1605461e2a4beb':
AArch64: Fix printf format strings.
Colin Cross [Fri, 24 Jan 2014 18:38:15 +0000 (10:38 -0800)]
am
2bd389e3: Merge "AArch64: Fix printf format strings."
* commit '
2bd389e386feeef0a901ccf68b106eafea6bbcb4':
AArch64: Fix printf format strings.
Colin Cross [Fri, 24 Jan 2014 18:35:13 +0000 (18:35 +0000)]
Merge "AArch64: Fix printf format strings."
Matthew Leach [Mon, 14 Jan 2013 15:07:12 +0000 (15:07 +0000)]
AArch64: Fix printf format strings.
Use the portable printf format strings as defined in:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#64-bit_Portability
These changes are necessary when compiling for LP64 architectures.
Change-Id: I3ff355dda5a7a72a8e659a7e5d2014aa4e62f8c3
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Matteo Franchin <matteo.franchin@arm.com>
Colin Cross [Thu, 23 Jan 2014 23:43:38 +0000 (23:43 +0000)]
am
f8b19aa2: am
05952ccb: Merge "netd: remove from include path"
* commit '
f8b19aa2b6b182261f74ce4265247a2d7a64801b':
netd: remove $(KERNEL_HEADERS) from include path
Colin Cross [Thu, 23 Jan 2014 23:10:07 +0000 (15:10 -0800)]
am
05952ccb: Merge "netd: remove from include path"
* commit '
05952ccb4a2f44ada2eb0d11480eb2780c8caa91':
netd: remove $(KERNEL_HEADERS) from include path
Colin Cross [Thu, 23 Jan 2014 23:02:26 +0000 (23:02 +0000)]
Merge "netd: remove $(KERNEL_HEADERS) from include path"
Colin Cross [Thu, 23 Jan 2014 07:51:53 +0000 (23:51 -0800)]
netd: remove $(KERNEL_HEADERS) from include path
The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.
Change-Id: I0f07ecde4c519341153e58e3cdd6441e84362ae1
Dmitry Shmidt [Wed, 18 Dec 2013 22:44:13 +0000 (14:44 -0800)]
resolved conflicts for merge of
124d77eb to master
Change-Id: Ic28a38b2d6acf2b4fb3e0da3794fea6fd37d9981
Dmitry Shmidt [Wed, 18 Dec 2013 20:18:37 +0000 (12:18 -0800)]
am
7f4117ee: Merge "tethering: Add --dhcp-authoritative to dnsmasq daemon"
* commit '
7f4117ee430e5069bffc89ad4e3841845586951a':
tethering: Add --dhcp-authoritative to dnsmasq daemon
Dmitry Shmidt [Wed, 18 Dec 2013 20:12:31 +0000 (20:12 +0000)]
Merge "tethering: Add --dhcp-authoritative to dnsmasq daemon"
Dmitry Shmidt [Fri, 13 Dec 2013 00:41:16 +0000 (16:41 -0800)]
tethering: Add --dhcp-authoritative to dnsmasq daemon
Bug:
12114185
Change-Id: I91e83c78de251ebe88bed30174f1422b62edca07
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 13 Dec 2013 00:41:16 +0000 (16:41 -0800)]
tethering: Add --dhcp-authoritative to dnsmasq daemon
Bug:
12114185
Change-Id: I91e83c78de251ebe88bed30174f1422b62edca07
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Sreeram Ramachandran [Tue, 10 Dec 2013 18:06:08 +0000 (10:06 -0800)]
Fix duplicate rule count modification.
ag/161626 introduced modifyRuleCount() to centralize rule count mutations, but
didn't remove the redundant block above the callsite in modifyRoute().
Change-Id: I5164ccf0d92041836166dcb5798be168276d3e7d
Sreeram Ramachandran [Mon, 9 Dec 2013 22:43:26 +0000 (14:43 -0800)]
Fix typo in removeFwmarkRoute().
The typo was in the original CL that introduced this code (ag/326064).
Change-Id: Ib424189194f338b195026026c3d767ab0da53175
The Android Open Source Project [Sat, 23 Nov 2013 20:29:40 +0000 (12:29 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 03:19:58 +0000 (19:19 -0800)]
Dmitry Shmidt [Fri, 22 Nov 2013 21:57:09 +0000 (21:57 +0000)]
Merge "softap: Try wpa/wpa2 as best effort"
The Android Open Source Project [Fri, 22 Nov 2013 19:31:43 +0000 (11:31 -0800)]
Merge commit '
f0aa90f7898502aae6a015b49abcb2a5a0719fad' into HEAD
Change-Id: If9a70bdfa24a37bab6980194af6fa4f73d9f4bd1
Dmitry Shmidt [Fri, 22 Nov 2013 00:50:22 +0000 (16:50 -0800)]
softap: Try wpa/wpa2 as best effort
Change-Id: I02ff0b01e96ac7bb3044df9621ebf7c8a62cb6c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Lorenzo Colitti [Fri, 22 Nov 2013 04:08:18 +0000 (20:08 -0800)]
am
3ccff3ba: am
22f485dc: Merge "Make netd listen for and notify RDNSS options."
* commit '
3ccff3ba816338b85dd87555a7803cb8e803f4e5':
Make netd listen for and notify RDNSS options.
Lorenzo Colitti [Fri, 22 Nov 2013 04:08:18 +0000 (20:08 -0800)]
am
70cf5074: (-s ours) am
6eeea7cb: Merge "Simplify notification code in NetlinkHandler."
* commit '
70cf50742decc490b93c1d15a49db00125c73d64':
Simplify notification code in NetlinkHandler.
Lorenzo Colitti [Fri, 22 Nov 2013 01:12:16 +0000 (17:12 -0800)]
am
3995bf50: am
634b7b7b: Merge "Don\'t log "Unexpected netlink message" on NDUSEROPT"
* commit '
3995bf502e1298109baba41a7dbc0a272530d9a8':
Don't log "Unexpected netlink message" on NDUSEROPT
Lorenzo Colitti [Fri, 22 Nov 2013 01:12:15 +0000 (17:12 -0800)]
am
6931528a: am
1dc26be0: Merge "Unbreak interface add/delete notifications."
* commit '
6931528a7914737dc5b7f530a4b5db6f1147fe57':
Unbreak interface add/delete notifications.
Lorenzo Colitti [Fri, 22 Nov 2013 01:12:14 +0000 (17:12 -0800)]
am
307650e1: am
4006ada5: (-s ours) Merge "Make netd track and notify IP address changes."
* commit '
307650e17a12452c1ce5ddab02e6027baf6a10cb':
Make netd track and notify IP address changes.
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:29 +0000 (17:07 -0800)]
am
22f485dc: Merge "Make netd listen for and notify RDNSS options."
* commit '
22f485dc390ba75c76645d2ced812cd1988b6bf0':
Make netd listen for and notify RDNSS options.
Lorenzo Colitti [Fri, 22 Nov 2013 01:07:28 +0000 (17:07 -0800)]
am
6eeea7cb: Merge "Simplify notification code in NetlinkHandler."
* commit '
6eeea7cb5a563cf8369c8373ae469ef1f676d7a9':
Simplify notification code in NetlinkHandler.