From owner-svn-src-all@freebsd.org  Thu Nov 10 20:51:27 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C461FC3A0CE;
 Thu, 10 Nov 2016 20:51:27 +0000 (UTC)
 (envelope-from syrinx@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 900EDA39;
 Thu, 10 Nov 2016 20:51:27 +0000 (UTC)
 (envelope-from syrinx@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAAKpQMo033921;
 Thu, 10 Nov 2016 20:51:26 GMT (envelope-from syrinx@FreeBSD.org)
Received: (from syrinx@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAAKpQjT033920;
 Thu, 10 Nov 2016 20:51:26 GMT (envelope-from syrinx@FreeBSD.org)
Message-Id: <201611102051.uAAKpQjT033920@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: syrinx set sender to
 syrinx@FreeBSD.org using -f
From: Shteryana Shopova <syrinx@FreeBSD.org>
Date: Thu, 10 Nov 2016 20:51:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308490 - head/contrib/bsnmp/lib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Nov 2016 20:51:27 -0000

Author: syrinx
Date: Thu Nov 10 20:51:26 2016
New Revision: 308490
URL: https://svnweb.freebsd.org/changeset/base/308490

Log:
  Reply to a snmpEngineID discovery PDU with a Report PDU as per the
  requirements of RFC 3414 section 4.
  
  PR:	174974
  Submitted by:	pguyot@kallisys.net
  Reported by:	several people
  Reviewed by:	bz@

Modified:
  head/contrib/bsnmp/lib/snmpagent.c

Modified: head/contrib/bsnmp/lib/snmpagent.c
==============================================================================
--- head/contrib/bsnmp/lib/snmpagent.c	Thu Nov 10 19:55:45 2016	(r308489)
+++ head/contrib/bsnmp/lib/snmpagent.c	Thu Nov 10 20:51:26 2016	(r308490)
@@ -171,7 +171,10 @@ snmp_pdu_create_response(const struct sn
 	memset(resp, 0, sizeof(*resp));
 	strcpy(resp->community, pdu->community);
 	resp->version = pdu->version;
-	resp->type = SNMP_PDU_RESPONSE;
+	if (pdu->flags & SNMP_MSG_AUTODISCOVER)
+		resp->type = SNMP_PDU_REPORT; /* RFC 3414.4 */
+	else
+		resp->type = SNMP_PDU_RESPONSE;
 	resp->request_id = pdu->request_id;
 	resp->version = pdu->version;