Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c00c31f authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: multicast driver cleanup 



Byte-swapping of the port and IP address passed in to the multicast driver by
the user used to happen in different places, which was a bug in itself.  The
port also was swapped before being printk-ed, which led to a misleading
message.  This patch moves the port swapping to the same place as the IP
address swapping.  It also cleans up the error paths of mcast_open.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 060e3522

arch/um/drivers/mcast_kern.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -73,7 +73,6 @@ int mcast_setup(char *str, char **mac_out, void *data) 
	struct mcast_init *init = data;

	struct mcast_init *init = data;

	char *port_str = NULL, *ttl_str = NULL, *remain;

	char *port_str = NULL, *ttl_str = NULL, *remain;

	char *last;

	char *last;

	int n;





	*init = ((struct mcast_init)

	*init = ((struct mcast_init)

		{ .addr 	= "239.192.168.1",

		{ .addr 	= "239.192.168.1",
@@ -89,13 +88,12 @@ int mcast_setup(char *str, char **mac_out, void *data) 
	}

	}

	

	

	if(port_str != NULL){

	if(port_str != NULL){

		n = simple_strtoul(port_str, &last, 10);

		init->port = simple_strtoul(port_str, &last, 10);

		if((*last != '\0') || (last == port_str)){

		if((*last != '\0') || (last == port_str)){

			printk(KERN_ERR "mcast_setup - Bad port : '%s'\n", 

			printk(KERN_ERR "mcast_setup - Bad port : '%s'\n", 

			       port_str);

			       port_str);

			return(0);

			return(0);

		}

		}

		init->port = htons(n);

	}

	}





	if(ttl_str != NULL){

	if(ttl_str != NULL){

arch/um/drivers/mcast_user.c

+15 −32
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static struct sockaddr_in *new_addr(char *addr, unsigned short port) 
	}

	}

	sin->sin_family = AF_INET;

	sin->sin_family = AF_INET;

	sin->sin_addr.s_addr = in_aton(addr);

	sin->sin_addr.s_addr = in_aton(addr);

	sin->sin_port = port;

	sin->sin_port = htons(port);

	return(sin);

	return(sin);

}

}
@@ -55,28 +55,25 @@ static int mcast_open(void *data) 
	struct mcast_data *pri = data;

	struct mcast_data *pri = data;

	struct sockaddr_in *sin = pri->mcast_addr;

	struct sockaddr_in *sin = pri->mcast_addr;

	struct ip_mreq mreq;

	struct ip_mreq mreq;

	int fd, yes = 1;

	int fd = -EINVAL, yes = 1, err = -EINVAL;;









	if ((sin->sin_addr.s_addr == 0) || (sin->sin_port == 0)) {

	if ((sin->sin_addr.s_addr == 0) || (sin->sin_port == 0))

		fd = -EINVAL;

		goto out;

		goto out;

	}





	fd = socket(AF_INET, SOCK_DGRAM, 0);

	fd = socket(AF_INET, SOCK_DGRAM, 0);



	if (fd < 0){

	if (fd < 0){

		printk("mcast_open : data socket failed, errno = %d\n", 

		printk("mcast_open : data socket failed, errno = %d\n", 

		       errno);

		       errno);

		fd = -ENOMEM;

		fd = -errno;

		goto out;

		goto out;

	}

	}





	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {

	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {

		printk("mcast_open: SO_REUSEADDR failed, errno = %d\n",

		printk("mcast_open: SO_REUSEADDR failed, errno = %d\n",

			errno);

			errno);

		os_close_file(fd);

		goto out_close;

		fd = -EINVAL;

		goto out;

	}

	}





	/* set ttl according to config */

	/* set ttl according to config */
@@ -84,26 +81,20 @@ static int mcast_open(void *data) 
		       sizeof(pri->ttl)) < 0) {

		       sizeof(pri->ttl)) < 0) {

		printk("mcast_open: IP_MULTICAST_TTL failed, error = %d\n",

		printk("mcast_open: IP_MULTICAST_TTL failed, error = %d\n",

			errno);

			errno);

		os_close_file(fd);

		goto out_close;

		fd = -EINVAL;

		goto out;

	}

	}





	/* set LOOP, so data does get fed back to local sockets */

	/* set LOOP, so data does get fed back to local sockets */

	if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {

	if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {

		printk("mcast_open: IP_MULTICAST_LOOP failed, error = %d\n",

		printk("mcast_open: IP_MULTICAST_LOOP failed, error = %d\n",

			errno);

			errno);

		os_close_file(fd);

		goto out_close;

		fd = -EINVAL;

		goto out;

	}

	}





	/* bind socket to mcast address */

	/* bind socket to mcast address */

	if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {

	if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {

		printk("mcast_open : data bind failed, errno = %d\n", errno);

		printk("mcast_open : data bind failed, errno = %d\n", errno);

		os_close_file(fd);

		goto out_close;

		fd = -EINVAL;

		goto out;

	}		

	}		

	

	

	/* subscribe to the multicast group */

	/* subscribe to the multicast group */
@@ -117,12 +108,15 @@ static int mcast_open(void *data) 
		       "interface on the host.\n");

		       "interface on the host.\n");

		printk("eth0 should be configured in order to use the "

		printk("eth0 should be configured in order to use the "

		       "multicast transport.\n");

		       "multicast transport.\n");

		os_close_file(fd);

                goto out_close;

		fd = -EINVAL;

	}

	}





 out:

 out:

	return(fd);

	return fd;



 out_close:

        os_close_file(fd);

        return err;

}

}





static void mcast_close(int fd, void *data)

static void mcast_close(int fd, void *data)
@@ -164,14 +158,3 @@ struct net_user_info mcast_user_info = { 
	.delete_address = NULL,

	.delete_address = NULL,

	.max_packet	= MAX_PACKET - ETH_HEADER_OTHER

	.max_packet	= MAX_PACKET - ETH_HEADER_OTHER

};
 
};
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */