am 91a9b452: DO NOT MERGE DHCP changes from master
* commit '91a9b452152f3c147f5356f0d2f503a664bd2a46':
DO NOT MERGE DHCP changes from master
diff --git a/fastboot/engine.c b/fastboot/engine.c
index 28a0ad9..6d94035 100644
--- a/fastboot/engine.c
+++ b/fastboot/engine.c
@@ -69,6 +69,7 @@
Action *next;
char cmd[64];
+ const char *prod;
void *data;
unsigned size;
@@ -183,6 +184,16 @@
return status;
}
+ if (a->prod) {
+ if (strcmp(a->prod, cur_product) != 0) {
+ double split = now();
+ fprintf(stderr,"IGNORE, product is %s required only for %s [%7.3fs]\n",
+ cur_product, a->prod, (split - a->start));
+ a->start = split;
+ return 0;
+ }
+ }
+
yes = match(resp, value, count);
if (invert) yes = !yes;
@@ -214,10 +225,12 @@
return cb_check(a, status, resp, 1);
}
-void fb_queue_require(const char *var, int invert, unsigned nvalues, const char **value)
+void fb_queue_require(const char *prod, const char *var,
+ int invert, unsigned nvalues, const char **value)
{
Action *a;
a = queue_action(OP_QUERY, "getvar:%s", var);
+ a->prod = prod;
a->data = value;
a->size = nvalues;
a->msg = mkmsg("checking %s", var);
@@ -244,6 +257,25 @@
a->func = cb_display;
}
+static int cb_save(Action *a, int status, char *resp)
+{
+ if (status) {
+ fprintf(stderr, "%s FAILED (%s)\n", a->cmd, resp);
+ return status;
+ }
+ strncpy(a->data, resp, a->size);
+ return 0;
+}
+
+void fb_queue_query_save(const char *var, char *dest, unsigned dest_size)
+{
+ Action *a;
+ a = queue_action(OP_QUERY, "getvar:%s", var);
+ a->data = (void *)dest;
+ a->size = dest_size;
+ a->func = cb_save;
+}
+
static int cb_do_nothing(Action *a, int status, char *resp)
{
fprintf(stderr,"\n");
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 2ddc4f8..4a2de20 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -42,6 +42,8 @@
#include "fastboot.h"
+char cur_product[FB_RESPONSE_SZ + 1];
+
void bootimg_set_cmdline(boot_img_hdr *h, const char *cmdline);
boot_img_hdr *mkbootimg(void *kernel, unsigned kernel_size,
@@ -340,6 +342,7 @@
{
char *val[MAX_OPTIONS];
const char **out;
+ char *prod = NULL;
unsigned n, count;
char *x;
int invert = 0;
@@ -350,6 +353,14 @@
} else if (!strncmp(name, "require ", 8)) {
name += 8;
invert = 0;
+ } else if (!strncmp(name, "require-for-product:", 20)) {
+ // Get the product and point name past it
+ prod = name + 20;
+ name = strchr(name, ' ');
+ if (!name) return -1;
+ *name = 0;
+ name += 1;
+ invert = 0;
}
x = strchr(name, '=');
@@ -381,7 +392,7 @@
if (out[n] == 0) return -1;
}
- fb_queue_require(name, invert, n, out);
+ fb_queue_require(prod, name, invert, n, out);
return 0;
}
@@ -432,6 +443,8 @@
queue_info_dump();
+ fb_queue_query_save("product", cur_product, sizeof(cur_product));
+
zdata = load_file(fn, &zsize);
if (zdata == 0) die("failed to load '%s'", fn);
@@ -498,6 +511,8 @@
queue_info_dump();
+ fb_queue_query_save("product", cur_product, sizeof(cur_product));
+
fname = find_item("info", product);
if (fname == 0) die("cannot find android-info.txt");
data = load_file(fname, &sz);
diff --git a/fastboot/fastboot.h b/fastboot/fastboot.h
index a4b27a0..9e043fe 100644
--- a/fastboot/fastboot.h
+++ b/fastboot/fastboot.h
@@ -43,8 +43,10 @@
/* engine.c - high level command queue engine */
void fb_queue_flash(const char *ptn, void *data, unsigned sz);;
void fb_queue_erase(const char *ptn);
-void fb_queue_require(const char *var, int invert, unsigned nvalues, const char **value);
+void fb_queue_require(const char *prod, const char *var, int invert,
+ unsigned nvalues, const char **value);
void fb_queue_display(const char *var, const char *prettyname);
+void fb_queue_query_save(const char *var, char *dest, unsigned dest_size);
void fb_queue_reboot(void);
void fb_queue_command(const char *cmd, const char *msg);
void fb_queue_download(const char *name, void *data, unsigned size);
@@ -54,4 +56,7 @@
/* util stuff */
void die(const char *fmt, ...);
+/* Current product */
+extern char cur_product[FB_RESPONSE_SZ + 1];
+
#endif
diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index e5c58b9..946c39d 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -366,10 +366,12 @@
int ifc_reset_connections(const char *ifname)
{
#ifdef HAVE_ANDROID_OS
- int result;
+ int result, success;
in_addr_t myaddr;
struct ifreq ifr;
+ struct in6_ifreq ifr6;
+ /* IPv4. Clear connections on the IP address. */
ifc_init();
ifc_get_info(ifname, &myaddr, NULL, NULL);
ifc_init_ifr(ifname, &ifr);
@@ -377,6 +379,21 @@
result = ioctl(ifc_ctl_sock, SIOCKILLADDR, &ifr);
ifc_close();
+ /*
+ * IPv6. On Linux, when an interface goes down it loses all its IPv6
+ * addresses, so we don't know which connections belonged to that interface
+ * So we clear all unused IPv6 connections on the device by specifying an
+ * empty IPv6 address.
+ */
+ ifc_init6();
+ // This implicitly specifies an address of ::, i.e., kill all IPv6 sockets.
+ memset(&ifr6, 0, sizeof(ifr6));
+ success = ioctl(ifc_ctl_sock6, SIOCKILLADDR, &ifr6);
+ if (result == 0) {
+ result = success;
+ }
+ ifc_close6();
+
return result;
#else
return 0;