Commit graph

90 commits

Author SHA1 Message Date
Dmitry Shmidt
d9a65a6561 Merge "Improving the time to wait for assigning IP address" 2015-03-19 00:26:30 +00:00
daisuke niwa
c855bddc67 Improving the time to wait for assigning IP address
Framework always spends 600msec for getting IP address.
DhcpStateMachine.runDhcp calls NetworkUtils.stopDhcp.
After that, it calls NetworkUtils.runDhcp.
In this case, wait_for_property of dhcp_utils.c calls three times.
At least three times, usleep is called.
So move usleep statement after property_get statement.

Change-Id: I77ffb9a5a64875b47bb528b494bb60b68c1acb5a
2015-02-27 09:50:01 +01:00
Nick Kralevich
6d3cddb2e2 More SOCK_CLOEXEC
Change-Id: I3e18f34d08a6443aaf55d7c91c27867840ac1773
2015-02-26 13:32:52 -08:00
Yabin Cui
e2d63af002 Move sprintf to snprintf.
Bug: 19340053
Change-Id: Id0d866e6195ed4752b4be6081eeb2aab8b1dbe9a
2015-02-17 19:27:51 -08:00
Elliott Hughes
187eade127 Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: I9f0b580474258fa648deb5287f98d8ec5533ca6f
2015-02-03 11:59:22 -08:00
Elliott Hughes
c463025a19 Revert "Remove netcfg's unused options."
This reverts commit f8e83054cb.

Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Elliott Hughes
f8e83054cb Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00
Elliott Hughes
a744b05984 Add missing <malloc.h> and <string.h> includes.
Change-Id: Ia41756e607663d056e7d2fdd7ecbec7e5841a913
2015-01-28 11:37:57 -08:00
Andreas Gampe
a5d5d84773 Libnetutils: Remove unused functions & variables
For build-system CFLAGS clean-up, remove unused functions and
variables.

Change-Id: I40a78d5a532dc32b53beb1cfc1b7645bab8add16
2014-11-24 10:43:53 -08:00
Sreeram Ramachandran
17622d09d5 Support resetting connections tied to any nonexistent address.
Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
2014-09-08 23:35:52 -07:00
Sreeram Ramachandran
e5ab3e3a4c Add a comment to not delete seemingly unused code.
Change-Id: I5b9d23eea7e850ab5a1f3a4e6c4f8ecdc3844864
2014-07-23 11:33:36 -07:00
Sreeram Ramachandran
eec232603d Put back some deleted code.
http://ag/507249 removed a bunch of supposedly dead (unused) code. It turns out
at least ifc_disable() is being used in some protected partner branches. Put
back that as well as ifc_enable() to keep it symmetric.

Bug: 15413389
Change-Id: Ibec83a66e5d9079876ccf36d250b95b7c0294c03
2014-07-23 09:30:53 -07:00
Sreeram Ramachandran
a723689eca Cleanup: Delete dead code.
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
2014-07-22 15:00:21 -07:00
Mark Salyzyn
3c55219b73 am 04482eab: am f998116b: am 08c372d1: Merge "libnetutils: Turn on -Werror"
* commit '04482eaba2584c3a05bff4a6647f0a2e55475a91':
  libnetutils: Turn on -Werror
2014-05-23 19:43:32 +00:00
Mark Salyzyn
c829080ba9 libnetutils: Turn on -Werror
- Get rid of a pair of out of range comparison warnings.
- Turn on -Werror for compilation

Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2883
2014-05-23 07:49:29 -07:00
Mark Salyzyn
51d65e6db9 am 2a7ce0bc: am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""
* commit '2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b':
  Revert "libnetutils: Turn on -Werror"
2014-05-22 00:33:57 +00:00
Mark Salyzyn
fd04f91dff am d7465194: am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"
* commit 'd746519443e37d7dde104779253830e92ae72c8e':
  libnetutils: Turn on -Werror
2014-05-22 00:33:56 +00:00
Mark Salyzyn
07dde4c314 Revert "libnetutils: Turn on -Werror"
This reverts commit 249c26de82.

Change-Id: I2a56c574fa8d842d5f3c51fd57ecf078838fcfec
2014-05-21 22:14:38 +00:00
Mark Salyzyn
249c26de82 libnetutils: Turn on -Werror
Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
2014-05-21 12:58:37 -07:00
Ajay Dudani
1c87ae05b3 libnetutils: Expect 1's complement if computed UDP checksum is zero
Per http://tools.ietf.org/html/rfc768:
If the computed  checksum  is zero,  it is transmitted  as all ones (the
equivalent  in one's complement  arithmetic).   An all zero  transmitted
checksum  value means that the transmitter  generated  no checksum  (for
debugging or for higher level protocols that don't care).

Bug: 10642341
Change-Id: Ib6296dcf3f420f87227047a645c99d9f7ea0d437
2013-12-12 11:24:26 -08:00
The Android Open Source Project
66ed50af68 Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
2013-11-22 13:44:43 -08:00
Elliott Hughes
fc6a1da9a2 am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."
* commit 'd97a34af49f6beafc21d5f459ea62b499544f9f3':
  Fix libnetutils to build with clean uapi headers.
2013-11-12 14:58:50 -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