Commit Graph

69 Commits

Author SHA1 Message Date
The Android Open Source Project 66ed50af68 Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
2013-11-22 13:44:43 -08:00
Elliott Hughes 2d640c2640 Fix libnetutils to build with clean uapi headers.
(And old ones too.)

Bug: 11559337
Change-Id: Ie61218055bbe07655a9d53c539aa47b85098e42c
2013-11-12 13:05:01 -08:00
Dmitry Shmidt be06210c50 libnetutils: Get mtu together with dhcp session results
Change-Id: I517fd1f62d451b07466a21a2b770d9ce389dac19
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-08-02 14:09:09 -07:00
Colin Cross 0a0a8768cb resolved conflicts for merge of c0df50af to stage-aosp-master
Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
2013-06-10 15:06:43 -07:00
Michael Wu 897df50f4c fix bad return value in dhcp_do_request_*
1. bad return status make it return uninitialized prefixLength with a magic
number in android_net_utils_runDhcpCommon()
2. it will make DhcpInfoInternal.makeLinkAddress() to throw
IllegalArgumentException when try to connect a Wifi AP
3. the exception will make system reboot, of cource it random.

Change-Id: Iabc0cd5b69c1316f4eeae0aa1b8a91444dca4562
Signed-off-by: Michael Wu <michaelstay@gmail.com>
2013-06-05 08:42:22 +08:00
Ying Wang 083b5ccba3 Add liblog
Bug: 8580410
Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
2013-04-09 22:03:45 -07:00
Robert Greenwalt c93d30f50d Merge "Support 4 dns servers, up from 2" 2013-01-11 15:38:59 -08:00
Robert Greenwalt fdd573188d Support 4 dns servers, up from 2
bug:5958524
Change-Id: I61c25e23d21e92653ec9b874d3d456a330d8fe05
2013-01-10 11:36:09 -08:00
Elliott Hughes 273f504c14 am bab2ba3e: am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"
* commit 'bab2ba3e730d610883added31ff806da352cbb07':
  Fix dhcpcd startup when net.hostname is not set
2013-01-07 12:26:21 -08:00
Matt Gumbel ba2ba5c011 Fix dhcpcd startup when net.hostname is not set
Commit 62d6f74 swapped p2p_interface and DHCP_CONFIG_PATH
erroneously. This reverts them to their correct ordering and makes dhcpcd
startup work again.

Change-Id: Iea033a7e0dad98bb2a63fb39755330675cfbb0ab
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
2013-01-04 10:18:45 -08:00
Irfan Sheriff 94cecfc4a0 Handle empty gateways
Change-Id: Icbc1859125bae0bc222685bfbc18af38273d6827
2012-12-07 10:36:29 -08:00
Irfan Sheriff 35c625194b Remove dead code
Remove unnecessary DHCP properties

Change-Id: I27b5d0a2d8fd67c911d04bb2d18dc1b3f10e7c2a
2012-12-06 12:08:05 -08:00
Robert Greenwalt 6ecbdca4c1 Read domain name from dhcp system prop
This property is set by the dhcpcd daemon.

bug:6799630
Change-Id: I21002e286819cff420ec72e3857764e5f58ecfe4
2012-11-13 12:04:09 -08:00
Stephen Hines 278cded6be am d2e826b5: am 65c37c81: Merge "Fixed an unused param warning"
* commit 'd2e826b5192f3b964c893b8230cee1d8bdb84071':
  Fixed an unused param warning
2012-08-08 17:44:05 -07:00
Chris Dearman 6ee3ecc03a Decode DHCP netmask option correctly
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ibc288458baf2f75c5b19a46e4c97ee59521cc9a5
2012-08-08 15:50:03 -07:00
Edwin Vane a5db95da38 Fixed an unused param warning
libnetutils had a single warning. Fixed it to make it clean.

Change-Id: I9297e556657a38dbdd7d1d0ac4bc3574801d5ac9
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-02 10:40:12 -04:00
Ed Heyl 3cac204d35 Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev 2012-07-28 11:48:12 -07:00
Dmitry Shmidt 62d6f74863 dhcp_utils: Add -f dhcpcd.conf processing
Change-Id: Idd5c8734fafd27c76f61820f223627af4c71a271
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-07-23 17:39:30 -07:00
Alex Yakavenka 7c3d1c291a Export flags needed for ifc_reset_connections API in netutils
Code using ifc_reset_connections api needs to have access to
predefined masks for reset_mask parameter

Change-Id: I90bc5e1b62ae4a88501c8ad4e353c0d93d319579
2012-06-21 16:56:01 -07:00
Irfan Sheriff 89f58cf827 Reuse system properties for p2p
p2p interfaces keep increasing. Reuse a single "p2p" phrase to track all
p2p specific properties.

Longer term, we will remove the use of system properties for dhcp

Also, fixed some warnings

Bug: 6522164
Change-Id: Ibe9a68a1b5db9d5b0fe88c854d9f94b1b9930970
2012-05-23 14:13:40 -07:00
Jeff Sharkey 0fb8ec8e9a Pipe DHCP vendor info towards framework.
Bug: 6344821
Change-Id: Iebce3e1b36175fc88f44e18db647c43b1245f18f
2012-04-19 10:36:05 -07:00
Steve Block 01dda204cd Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: Ibcffdcf620ebae1c389446ce8e9d908f11ac039c
2012-01-08 11:03:26 +00:00
Steve Block ae8b56c0d1 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I1e070511b6a538e9f1c94657356437a457d58882
2012-01-05 22:25:38 +00:00
Steve Block 8d66c49258 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I9244d927f14c750cd359ebffb1fc1c355a755d5a
2012-01-03 22:32:30 +00:00
Irfan Sheriff da96a66b88 Merge "Fix dhcp comments" 2011-11-09 13:42:27 -08:00
Irfan Sheriff 35c28608bf Fix dhcp comments
Change-Id: Ia99b2c10ff6cf8c75c23db49f1e9cf7a043141cc
2011-11-09 11:11:21 -08:00
tk.mun ed21633a5e Wimax: wimax related changes for libnetutils
- Modified dhcp renew code for the new conenctivity changes in ICS

Change-Id: I614dfc62a875b79dbd8b7c46f4d87f366a3c3661
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
2011-11-07 17:15:19 -08:00
Lorenzo Colitti 47ddb515b7 Support adding, deleting, and clearing IPv6 addrs.
- Provide a function to add and delete IPv4/IPv6 addresses
  using netlink.
- Provide a function that clears all IP addresses on an
  interface that can be used by netd.

Also, a couple of cleanups:

- Update the header file to match reality, and include the
  header file in the implementation. Also fix a caller that
  has an incorrect method signature.
- Fix whitespace in Android.mk.

Change-Id: Ifba9d60cdfffb0b7e5c3b9c6ab328f5f77d259c4
2011-09-28 17:12:13 -07:00
Wink Saville 0c613613d7 Reduce connectivity logging.
Change-Id: Ib71f3f17d56ba614436bcb18f9100196fd7e7ee6
2011-09-20 15:53:23 -07:00
repo sync a329b4296c Update dhcp for p2p
Bug: 5002384
Change-Id: I4ee4f80e2bc2966aa30d1344182d90f30117fbae
2011-08-12 15:07:14 -07:00
Jae Seo 6d956cc089 Use dhcp netmask value rather than its pointer (patch from Marvell)
Change-Id: Iffe2ca52333df4ef393c5305a5b66582006e4699
2011-07-29 15:23:39 +09:00
Jeff Brown 29e1e7393d Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
2011-07-11 22:12:32 -07:00
Wink Saville 7da24861ea am 436deea5: am 979203ee: Add reset_mask as parameter to ifc_reset_connections
* commit '436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce':
  Add reset_mask as parameter to ifc_reset_connections
2011-07-08 12:28:18 -07:00
Wink Saville 979203ee34 Add reset_mask as parameter to ifc_reset_connections
The reset_mask allows either IPv4 and or IPv6 connections
of an interface to be reset.

Bug: 4981919
Change-Id: Id2d9ab90e30091d3d0764c66d4b01b73c0edbfcc
2011-07-07 12:16:12 -07:00
Robert Greenwalt b6b48ae47a Revert some of change 109925 to fix connectivity
bug:4476009
Change-Id: I93c492eebe24d9744b8ef79378c73301d167f5a3
2011-05-25 21:22:56 -07:00
Robert Greenwalt ab86504f58 am 61e33b33: am aded02cb: Merge "Add v4/v6 route add/removal support" into honeycomb-LTE
* commit '61e33b338cbb90c34cb3e07fe55edcc08c6ce3b8':
  Add v4/v6 route add/removal support
2011-05-19 07:21:22 -07:00
Robert Greenwalt 021d0a2e7c Add v4/v6 route add/removal support
Change-Id: I259a3be4fe473dff75336139c9584d2c5ab27b2d
2011-05-15 10:48:08 -07:00
Irfan Sheriff 3746be268c DHCP changes from master
Pick dhcp changes from master for the renewal fixes

Bug: 3344732
Change-Id: Ie49cd11f74cf89e9edf2d1c788a699ce0996190d
2011-04-30 12:59:51 -07:00
Irfan Sheriff bdaaec1ba0 Use DHCP server as gateway when it is absent
Some routers can return 0.0.0.0 as gateway address,
use DHCP server as gateway in such instances

Change-Id: I7e8db8e619475efce53ce391f77f2c13c3b7268c
2011-04-15 16:35:59 -07:00
Jake Hamby 6f49d5f266 Add missing function required to load Crespo RIL library.
ifc_set_mask() function was removed in a previous change. This function
is called by the Crespo RIL, so we can't remove it yet.

Bug: 4268537
Change-Id: I634580ee8d2a1aff069178837cc121c89c5e73f9
2011-04-11 19:46:41 -07:00
Lorenzo Colitti 7b43eb1224 am e9fa47ca: am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
* commit 'e9fa47ca664577e4ca7ed270f1f72a2d43fb3423':
  Kill IPv6 sockets as well as IPv4 sockets.
2011-03-30 17:36:37 -07:00
TK MUN 9d15787034 Add per interface dhcp client support
Added when using dhcp on both wimax and wifi. But should be useful across multiple
services running dhcp now. Also adds a renewal api

Change-Id: Ic850a612dd429cd675b5b0224ff58895f9d8e4d9
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-23 16:24:13 -07:00
Lorenzo Colitti 6cf73eadc7 Kill IPv6 sockets as well as IPv4 sockets.
Change-Id: Ib9e070e510d1a762295faf4dc673c9a6e8207a8d
2011-03-17 11:20:25 -07:00
Robert Greenwalt 09dd819d27 Stop using netmask in the framework
This pushes prefixLength down as far as we can.

bug:2542681
Change-Id: I94b7cde9d10e97ee2c071d92f25555cff5934f0b
2011-02-02 14:18:44 -08:00
Dmitry Shmidt b42db825e1 Merge "libnetutils: Clean all IPs assigned to the interface on cleaning" 2011-01-27 15:59:52 -08:00
Dmitry Shmidt 9092b91cca libnetutils: Clean all IPs assigned to the interface on cleaning
Change-Id: Ic285bbb4b224fc4e62e88e76b8b448edbe814a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-01-27 14:16:20 -08:00
Robert Greenwalt faab26d542 Change our dhcp interface to be IPv6 compat.
Doesn't do IPv6, but removes v4-specific structures from the framework
(netmask, ints for addrs)
bug:2542681

Change-Id: I1110e6f32d42a472b104835a4298e18b391db0a7
2011-01-25 11:21:04 -08:00
Dmitry Shmidt 7d05a80da8 libnetutils: Fix warning
Change-Id: I2a914314a027e0e542d45dff0c2e6029e9f40615
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-01-24 17:10:30 -08:00
Irfan Sheriff b1723b6892 Reduce polling interval to 200ms
DHCP success can take up to 2 seconds to
be reported to the statemachine. Move wait
time after check and reduce it to 200ms

Change-Id: I6b2546f80435a84ee6f44f4d91f348bacfdc8433
2010-12-21 11:15:28 -08:00
Stan Chesnutt 36f93f0120 fix undefined behavior with certain left-shift count values
Change-Id: I1b71de28312a56a3b1d27fcfaf0a7b71d5777e6c
2010-12-16 10:59:48 -08:00