svn commit: r317351 - stable/11/usr.sbin/ctld

[Alexander Motin]

Author: mav
Date: Mon Apr 24 06:32:35 2017
New Revision: 317351
URL: https://svnweb.freebsd.org/changeset/base/317351

Log:
  MFC r316677: Do not register in CTL portal groups without portals.
  
  From config synthax point of view such portal groups are not incorrect,
  but they are useless since can not receive any connection.  And since
  CTL port resource is very limited, it is good to save it.

Modified:
  stable/11/usr.sbin/ctld/ctld.c
  stable/11/usr.sbin/ctld/ctld.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/11/usr.sbin/ctld/ctld.c	Sun Apr 23 23:09:02 2017	(r317350)
+++ stable/11/usr.sbin/ctld/ctld.c	Mon Apr 24 06:32:35 2017	(r317351)
@@ -1237,7 +1237,6 @@ port_new(struct conf *conf, struct targe
 	port->p_target = target;
 	TAILQ_INSERT_TAIL(&pg->pg_ports, port, p_pgs);
 	port->p_portal_group = pg;
-	port->p_foreign = pg->pg_foreign;
 	return (port);
 }
 
@@ -1310,6 +1309,19 @@ port_delete(struct port *port)
 	free(port);
 }
 
+int
+port_is_dummy(struct port *port)
+{
+
+	if (port->p_portal_group) {
+		if (port->p_portal_group->pg_foreign)
+			return (1);
+		if (TAILQ_EMPTY(&port->p_portal_group->pg_portals))
+			return (1);
+	}
+	return (0);
+}
+
 struct target *
 target_new(struct conf *conf, const char *name)
 {
@@ -1885,10 +1897,10 @@ conf_apply(struct conf *oldconf, struct 
 	 * and missing in the new one.
 	 */
 	TAILQ_FOREACH_SAFE(oldport, &oldconf->conf_ports, p_next, tmpport) {
-		if (oldport->p_foreign)
+		if (port_is_dummy(oldport))
 			continue;
 		newport = port_find(newconf, oldport->p_name);
-		if (newport != NULL && !newport->p_foreign)
+		if (newport != NULL && !port_is_dummy(newport))
 			continue;
 		log_debugx("removing port \"%s\"", oldport->p_name);
 		error = kernel_port_remove(oldport);
@@ -2008,11 +2020,11 @@ conf_apply(struct conf *oldconf, struct 
 	 * Now add new ports or modify existing ones.
 	 */
 	TAILQ_FOREACH(newport, &newconf->conf_ports, p_next) {
-		if (newport->p_foreign)
+		if (port_is_dummy(newport))
 			continue;
 		oldport = port_find(oldconf, newport->p_name);
 
-		if (oldport == NULL || oldport->p_foreign) {
+		if (oldport == NULL || port_is_dummy(oldport)) {
 			log_debugx("adding port \"%s\"", newport->p_name);
 			error = kernel_port_add(newport);
 		} else {

Modified: stable/11/usr.sbin/ctld/ctld.h
==============================================================================
--- stable/11/usr.sbin/ctld/ctld.h	Sun Apr 23 23:09:02 2017	(r317350)
+++ stable/11/usr.sbin/ctld/ctld.h	Mon Apr 24 06:32:35 2017	(r317351)
@@ -151,7 +151,6 @@ struct port {
 	struct portal_group		*p_portal_group;
 	struct pport			*p_pport;
 	struct target			*p_target;
-	int				p_foreign;
 
 	uint32_t			p_ctl_port;
 };
@@ -371,6 +370,7 @@ struct port		*port_find(const struct con
 struct port		*port_find_in_pg(const struct portal_group *pg,
 			    const char *target);
 void			port_delete(struct port *port);
+int			port_is_dummy(struct port *port);
 
 struct target		*target_new(struct conf *conf, const char *name);
 void			target_delete(struct target *target);