Attachment 161221 Details for Bug 232889 – patch to extend shorthand ipaddress notations

[patch] patch to extend shorthand ipaddress notations

iptables.patch (text/plain), 1.35 KB, created by Neil Horman on 2007-08-13 20:23:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-08-13 20:23:00 UTC

Size: 1.35 KB

patch

obsolete

>--- iptables-1.2.11/iptables.c.orig	2007-08-13 14:04:14.000000000 -0400
>+++ iptables-1.2.11/iptables.c	2007-08-13 16:12:44.000000000 -0400
>@@ -573,6 +573,50 @@
> 	return (char *) NULL;
> }
> 
>+static void extend_dotted(const char *in, char *out, size_t outsz)
>+{
>+	const char *i;
>+	char *o;
>+	int dotcount, dotleft;
>+	char nexto = '.';
>+
>+	memset(out, 0x0, outsz);
>+	i = in;
>+	o = out;
>+	dotcount = 0;
>+	while(*i != '\0') {
>+		if (*i == '.') {
>+			dotcount++;	
>+			nexto = '0';
>+		} else
>+			nexto = '.';
>+
>+		*o=*i;
>+		o++;
>+		i++;
>+	}
>+
>+	dotleft = 3 - dotcount;
>+	
>+	while(dotleft) {
>+		*o = nexto;
>+		if (nexto == '.') {
>+			nexto = '0';
>+			dotleft--;
>+		} else
>+			nexto = '.';
>+		o++;
>+	}
>+
>+	/*
>+	 * Fill in the last zero if we need it
>+	 */
>+	if (nexto == '0')
>+		*o = '0';
>+
>+	return;
>+}
>+
> /*
>  *	All functions starting with "parse" should succeed, otherwise
>  *	the program fails.
>@@ -586,9 +630,12 @@
> parse_hostnetwork(const char *name, unsigned int *naddrs)
> {
> 	struct in_addr *addrp, *addrptmp;
>+	char ext_name[20];
>+
>+	extend_dotted(name, ext_name, 20);	
> 
>-	if ((addrptmp = dotted_to_addr(name)) != NULL ||
>-	    (addrptmp = network_to_addr(name)) != NULL) {
>+	if ((addrptmp = dotted_to_addr(ext_name)) != NULL ||
>+	    (addrptmp = network_to_addr(ext_name)) != NULL) {
> 		addrp = fw_malloc(sizeof(struct in_addr));
> 		inaddrcpy(addrp, addrptmp);
> 		*naddrs = 1;

Actions: View | Diff

Attachments on bug 232889: 161221