Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jan 2017 17:43:36 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r312552 - head/usr.sbin/ctld
Message-ID:  <201701201743.v0KHhaVv051788@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Fri Jan 20 17:43:36 2017
New Revision: 312552
URL: https://svnweb.freebsd.org/changeset/base/312552

Log:
  Fix build with ICL_KERNEL_PROXY.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/ctld/pdu.c

Modified: head/usr.sbin/ctld/pdu.c
==============================================================================
--- head/usr.sbin/ctld/pdu.c	Fri Jan 20 17:40:31 2017	(r312551)
+++ head/usr.sbin/ctld/pdu.c	Fri Jan 20 17:43:36 2017	(r312552)
@@ -106,9 +106,11 @@ pdu_new_response(struct pdu *request)
 static void
 pdu_receive_proxy(struct pdu *pdu)
 {
+	struct connection *conn;
 	size_t len;
 
 	assert(proxy_mode);
+	conn = pdu->pdu_connection;
 
 	kernel_receive(pdu);
 
@@ -117,7 +119,7 @@ pdu_receive_proxy(struct pdu *pdu)
 		log_errx(1, "protocol error: non-empty AHS");
 
 	len = pdu_data_segment_length(pdu);
-	assert(len <= pdu->pdu_connection->conn_max_recv_data_segment_length);
+	assert(len <= (size_t)conn->conn_max_recv_data_segment_length);
 	pdu->pdu_data_len = len;
 }
 
@@ -185,7 +187,7 @@ pdu_receive(struct pdu *pdu)
 
 	len = pdu_data_segment_length(pdu);
 	if (len > 0) {
-		if ((int)len > conn->conn_max_recv_data_segment_length) {
+		if (len > (size_t)conn->conn_max_recv_data_segment_length) {
 			log_errx(1, "protocol error: received PDU "
 			    "with DataSegmentLength exceeding %d",
 			    conn->conn_max_recv_data_segment_length);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701201743.v0KHhaVv051788>