"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/if-options.c" between
dhcpcd-7.1.0.tar.xz and dhcpcd-7.1.1.tar.xz

About: dhcpcd is a RFC2131 compliant DHCP (Dynamic Host Configuration Protocol) client.

if-options.c  (dhcpcd-7.1.0.tar.xz):if-options.c  (dhcpcd-7.1.1.tar.xz)
skipping to change at line 544 skipping to change at line 544
*dl = ctx->nd_opts_len; *dl = ctx->nd_opts_len;
*od = ifo->nd_override; *od = ifo->nd_override;
*odl = ifo->nd_override_len; *odl = ifo->nd_override_len;
*request = ifo->requestmasknd; *request = ifo->requestmasknd;
*require = ifo->requiremasknd; *require = ifo->requiremasknd;
*no = ifo->nomasknd; *no = ifo->nomasknd;
*reject = ifo->rejectmasknd; *reject = ifo->rejectmasknd;
return arg + strlen("nd_"); return arg + strlen("nd_");
} }
#ifdef DHCP6
if (strncmp(arg, "dhcp6_", strlen("dhcp6_")) == 0) { if (strncmp(arg, "dhcp6_", strlen("dhcp6_")) == 0) {
*d = ctx->dhcp6_opts; *d = ctx->dhcp6_opts;
*dl = ctx->dhcp6_opts_len; *dl = ctx->dhcp6_opts_len;
*od = ifo->dhcp6_override; *od = ifo->dhcp6_override;
*odl = ifo->dhcp6_override_len; *odl = ifo->dhcp6_override_len;
*request = ifo->requestmask6; *request = ifo->requestmask6;
*require = ifo->requiremask6; *require = ifo->requiremask6;
*no = ifo->nomask6; *no = ifo->nomask6;
*reject = ifo->rejectmask6; *reject = ifo->rejectmask6;
return arg + strlen("dhcp6_"); return arg + strlen("dhcp6_");
} }
#endif #endif
#endif
#ifdef INET #ifdef INET
*d = ctx->dhcp_opts; *d = ctx->dhcp_opts;
*dl = ctx->dhcp_opts_len; *dl = ctx->dhcp_opts_len;
*od = ifo->dhcp_override; *od = ifo->dhcp_override;
*odl = ifo->dhcp_override_len; *odl = ifo->dhcp_override_len;
#else #else
*d = NULL; *d = NULL;
*dl = 0; *dl = 0;
*od = NULL; *od = NULL;
skipping to change at line 1423 skipping to change at line 1425
ia->prefix_len = 0; ia->prefix_len = 0;
} }
} }
} }
#ifndef SMALL #ifndef SMALL
ia->sla_max = 0; ia->sla_max = 0;
ia->sla_len = 0; ia->sla_len = 0;
ia->sla = NULL; ia->sla = NULL;
#endif #endif
} }
#ifdef SMALL
break;
#else
if (ia->ia_type != D6_OPTION_IA_PD) if (ia->ia_type != D6_OPTION_IA_PD)
break; break;
#ifndef SMALL
for (p = fp; p; p = fp) { for (p = fp; p; p = fp) {
fp = strwhite(p); fp = strwhite(p);
if (fp) { if (fp) {
*fp++ = '\0'; *fp++ = '\0';
fp = strskipwhite(fp); fp = strskipwhite(fp);
} }
sla = reallocarray(ia->sla, sla = reallocarray(ia->sla,
ia->sla_len + 1, sizeof(*ia->sla)); ia->sla_len + 1, sizeof(*ia->sla));
if (sla == NULL) { if (sla == NULL) {
logerr(__func__); logerr(__func__);
skipping to change at line 2433 skipping to change at line 2439
i++, opt++) i++, opt++)
free_dhcp_opt_embenc(opt); free_dhcp_opt_embenc(opt);
free(ifo->dhcp_override); free(ifo->dhcp_override);
#endif #endif
ifo->dhcp_override = NULL; ifo->dhcp_override = NULL;
ifo->dhcp_override_len = 0; ifo->dhcp_override_len = 0;
#ifdef INET6 #ifdef INET6
ctx->nd_opts = ifo->nd_override; ctx->nd_opts = ifo->nd_override;
ctx->nd_opts_len = ifo->nd_override_len; ctx->nd_opts_len = ifo->nd_override_len;
#ifdef DHCP6
ctx->dhcp6_opts = ifo->dhcp6_override; ctx->dhcp6_opts = ifo->dhcp6_override;
ctx->dhcp6_opts_len = ifo->dhcp6_override_len; ctx->dhcp6_opts_len = ifo->dhcp6_override_len;
#endif
#else #else
for (i = 0, opt = ifo->nd_override; for (i = 0, opt = ifo->nd_override;
i < ifo->nd_override_len; i < ifo->nd_override_len;
i++, opt++) i++, opt++)
free_dhcp_opt_embenc(opt); free_dhcp_opt_embenc(opt);
free(ifo->nd_override); free(ifo->nd_override);
for (i = 0, opt = ifo->dhcp6_override; for (i = 0, opt = ifo->dhcp6_override;
i < ifo->dhcp6_override_len; i < ifo->dhcp6_override_len;
i++, opt++) i++, opt++)
free_dhcp_opt_embenc(opt); free_dhcp_opt_embenc(opt);
 End of changes. 6 change blocks. 
1 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)