From: Roy Marples <roy@marples.name>
Date: Tue, 11 Mar 2014 09:39:52 +0000 (+0000)
Subject: Describe DHCPv6 better.
X-Git-Tag: v6.3.2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef693d0cab55c50abfa012520282f36816ac055;p=thirdparty%2Fdhcpcd.git

Describe DHCPv6 better.
---

diff --git a/dhcp6.c b/dhcp6.c
index 4bd6b9ca..ecfef26b 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -2238,12 +2238,12 @@ dhcp6_handledata(void *arg)
 	case DHCP6_RECONFIGURE:
 		if (auth == NULL) {
 			syslog(LOG_ERR,
-			    "%s: unauthenticated Force Renew from %s",
-			    ifp->name, ctx->sfrom);
+			    "%s: unauthenticated %s from %s",
+			    ifp->name, op, ctx->sfrom);
 			return;
 		}
-		syslog(LOG_INFO, "%s: Force Renew from %s",
-		    ifp->name, ctx->sfrom);
+		syslog(LOG_INFO, "%s: %s from %s",
+		    ifp->name, op, ctx->sfrom);
 		o = dhcp6_getmoption(D6_OPTION_RECONF_MSG, r, len);
 		if (o == NULL) {
 			syslog(LOG_ERR,
@@ -2261,8 +2261,8 @@ dhcp6_handledata(void *arg)
 		case DHCP6_RENEW:
 			if (state->state != DH6S_BOUND) {
 				syslog(LOG_ERR,
-				    "%s: not bound, ignoring Force Renew",
-				    ifp->name);
+				    "%s: not bound, ignoring %s",
+				    ifp->name, op);
 				return;
 			}
 			eloop_timeout_delete(ifp->ctx->eloop,
@@ -2272,8 +2272,8 @@ dhcp6_handledata(void *arg)
 		case DHCP6_INFORMATION_REQ:
 			if (state->state != DH6S_INFORMED) {
 				syslog(LOG_ERR,
-				    "%s: not informed, ignoring Force Renew",
-				    ifp->name);
+				    "%s: not informed, ignoring %s",
+				    ifp->name, op);
 				return;
 			}
 			eloop_timeout_delete(ifp->ctx->eloop,
@@ -2282,8 +2282,8 @@ dhcp6_handledata(void *arg)
 			break;
 		default:
 			syslog(LOG_ERR,
-			    "%s: unsupported Reconfigure Message type",
-			    ifp->name);
+			    "%s: unsupported %s type %d",
+			    ifp->name, op, *D6_COPTION_DATA(o));
 			break;
 		}
 		return;