Commit ec1b28ca authored by Julian Anastasov's avatar Julian Anastasov Committed by Pablo Neira Ayuso
Browse files

ipvs: provide just conn to ip_vs_state_name 



In preparation for followup patches, provide just the cp
ptr to ip_vs_state_name.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ed07d9a0

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af, 
				  struct ip_vs_dest *dest, __u32 fwmark);

void ip_vs_conn_expire_now(struct ip_vs_conn *cp);



const char *ip_vs_state_name(__u16 proto, int state);

const char *ip_vs_state_name(const struct ip_vs_conn *cp);



void ip_vs_tcp_conn_listen(struct ip_vs_conn *cp);

int ip_vs_check_template(struct ip_vs_conn *ct, struct ip_vs_dest *cdest);

net/netfilter/ipvs/ip_vs_conn.c

+4 −4
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v) 
				&cp->caddr.in6, ntohs(cp->cport),

				&cp->vaddr.in6, ntohs(cp->vport),

				dbuf, ntohs(cp->dport),

				ip_vs_state_name(cp->protocol, cp->state),

				ip_vs_state_name(cp),

				(cp->timer.expires-jiffies)/HZ, pe_data);

		else

#endif
@@ -1118,7 +1118,7 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v) 
				ntohl(cp->caddr.ip), ntohs(cp->cport),

				ntohl(cp->vaddr.ip), ntohs(cp->vport),

				dbuf, ntohs(cp->dport),

				ip_vs_state_name(cp->protocol, cp->state),

				ip_vs_state_name(cp),

				(cp->timer.expires-jiffies)/HZ, pe_data);

	}

	return 0;
@@ -1169,7 +1169,7 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v) 
				&cp->caddr.in6, ntohs(cp->cport),

				&cp->vaddr.in6, ntohs(cp->vport),

				dbuf, ntohs(cp->dport),

				ip_vs_state_name(cp->protocol, cp->state),

				ip_vs_state_name(cp),

				ip_vs_origin_name(cp->flags),

				(cp->timer.expires-jiffies)/HZ);

		else
@@ -1181,7 +1181,7 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v) 
				ntohl(cp->caddr.ip), ntohs(cp->cport),

				ntohl(cp->vaddr.ip), ntohs(cp->vport),

				dbuf, ntohs(cp->dport),

				ip_vs_state_name(cp->protocol, cp->state),

				ip_vs_state_name(cp),

				ip_vs_origin_name(cp->flags),

				(cp->timer.expires-jiffies)/HZ);

	}

net/netfilter/ipvs/ip_vs_proto.c

+4 −4
Original line number Diff line number Diff line
@@ -193,13 +193,13 @@ ip_vs_create_timeout_table(int *table, int size) 
}





const char * ip_vs_state_name(__u16 proto, int state)

const char *ip_vs_state_name(const struct ip_vs_conn *cp)

{

	struct ip_vs_protocol *pp = ip_vs_proto_get(proto);

	struct ip_vs_protocol *pp = ip_vs_proto_get(cp->protocol);



	if (pp == NULL || pp->state_name == NULL)

		return (IPPROTO_IP == proto) ? "NONE" : "ERR!";

	return pp->state_name(state);

		return (cp->protocol == IPPROTO_IP) ? "NONE" : "ERR!";

	return pp->state_name(cp->state);

}