Attachment 171215 Details for Bug 210148 – Patch from Differential Revision D5491

[patch] Patch from Differential Revision D5491

D5491.diff (text/plain), 2.09 KB, created by Pedro F. Giffuni on 2016-06-08 19:15:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-06-08 19:15:44 UTC

Size: 2.09 KB

patch

obsolete

>Index: sys/netinet6/in6.c
>===================================================================
>--- sys/netinet6/in6.c
>+++ sys/netinet6/in6.c
>@@ -360,7 +360,6 @@
> 	case SIOCSPFXFLUSH_IN6:
> 	case SIOCSRTRFLUSH_IN6:
> 	case SIOCGIFALIFETIME_IN6:
>-	case SIOCSIFALIFETIME_IN6:
> 	case SIOCGIFSTAT_IN6:
> 	case SIOCGIFSTAT_ICMP6:
> 		sa6 = &ifr->ifr_addr;
>@@ -459,34 +458,6 @@
> 			goto out;
> 		}
> 		break;
>-
>-	case SIOCSIFALIFETIME_IN6:
>-	    {
>-		struct in6_addrlifetime *lt;
>-
>-		if (td != NULL) {
>-			error = priv_check(td, PRIV_NETINET_ALIFETIME6);
>-			if (error)
>-				goto out;
>-		}
>-		if (ia == NULL) {
>-			error = EADDRNOTAVAIL;
>-			goto out;
>-		}
>-		/* sanity for overflow - beware unsigned */
>-		lt = &ifr->ifr_ifru.ifru_lifetime;
>-		if (lt->ia6t_vltime != ND6_INFINITE_LIFETIME &&
>-		    lt->ia6t_vltime + time_uptime < time_uptime) {
>-			error = EINVAL;
>-			goto out;
>-		}
>-		if (lt->ia6t_pltime != ND6_INFINITE_LIFETIME &&
>-		    lt->ia6t_pltime + time_uptime < time_uptime) {
>-			error = EINVAL;
>-			goto out;
>-		}
>-		break;
>-	    }
> 	}
> 
> 	switch (cmd) {
>@@ -572,21 +543,6 @@
> 		}
> 		break;
> 
>-	case SIOCSIFALIFETIME_IN6:
>-		ia->ia6_lifetime = ifr->ifr_ifru.ifru_lifetime;
>-		/* for sanity */
>-		if (ia->ia6_lifetime.ia6t_vltime != ND6_INFINITE_LIFETIME) {
>-			ia->ia6_lifetime.ia6t_expire =
>-				time_uptime + ia->ia6_lifetime.ia6t_vltime;
>-		} else
>-			ia->ia6_lifetime.ia6t_expire = 0;
>-		if (ia->ia6_lifetime.ia6t_pltime != ND6_INFINITE_LIFETIME) {
>-			ia->ia6_lifetime.ia6t_preferred =
>-				time_uptime + ia->ia6_lifetime.ia6t_pltime;
>-		} else
>-			ia->ia6_lifetime.ia6t_preferred = 0;
>-		break;
>-
> 	case SIOCAIFADDR_IN6:
> 	{
> 		struct nd_prefixctl pr0;
>Index: sys/netinet6/in6_var.h
>===================================================================
>--- sys/netinet6/in6_var.h
>+++ sys/netinet6/in6_var.h
>@@ -453,7 +453,6 @@
> #define SIOCSRTRFLUSH_IN6	_IOWR('i', 80, struct in6_ifreq)
> 
> #define SIOCGIFALIFETIME_IN6	_IOWR('i', 81, struct in6_ifreq)
>-#define SIOCSIFALIFETIME_IN6	_IOWR('i', 82, struct in6_ifreq)
> #define SIOCGIFSTAT_IN6		_IOWR('i', 83, struct in6_ifreq)
> #define SIOCGIFSTAT_ICMP6	_IOWR('i', 84, struct in6_ifreq)
>

Actions: View | Diff

Attachments on bug 210148: 171215