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

Commit fb5ca813 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: usbip_network.c: coding style cleanup 



Change messges to debug, and fix a few coding style issues.

Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 756d6726

drivers/staging/usbip/userspace/src/usbip_network.c

+42 −31
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>

 *               2005-2007 Takahiro Hirofuchi

 *

 * Copyright (C) 2005-2007 Takahiro Hirofuchi

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program. If not, see <http://www.gnu.org/licenses/>.

 */



#include <sys/socket.h>
@@ -56,17 +69,15 @@ void pack_usb_interface(int pack __attribute__((unused)), 
	/* uint8_t members need nothing */

}





static ssize_t usbip_xmit(int sockfd, void *buff, size_t bufflen, int sending)

{

	ssize_t nbytes;

	ssize_t total = 0;



	if (!bufflen)

		return 0;



	do {

		ssize_t nbytes;



		if (sending)

			nbytes = send(sockfd, buff, bufflen, 0);

		else
@@ -81,7 +92,6 @@ static ssize_t usbip_xmit(int sockfd, void *buff, size_t bufflen, int sending) 


	} while (bufflen > 0);





	return total;

}
@@ -97,8 +107,8 @@ ssize_t usbip_send(int sockfd, void *buff, size_t bufflen) 


int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status)

{

	int ret;

	struct op_common op_common;

	int rc;



	memset(&op_common, 0, sizeof(op_common));
@@ -108,9 +118,9 @@ int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status) 


	PACK_OP_COMMON(1, &op_common);



	ret = usbip_send(sockfd, (void *) &op_common, sizeof(op_common));

	if (ret < 0) {

		err("usbip_send has failed");

	rc = usbip_send(sockfd, &op_common, sizeof(op_common));

	if (rc < 0) {

		dbg("usbip_send failed: %d", rc);

		return -1;

	}
@@ -119,21 +129,22 @@ int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status) 


int usbip_recv_op_common(int sockfd, uint16_t *code)

{

	int ret;

	struct op_common op_common;

	int rc;



	memset(&op_common, 0, sizeof(op_common));



	ret = usbip_recv(sockfd, (void *) &op_common, sizeof(op_common));

	if (ret < 0) {

		err("usbip_recv has failed ret=%d", ret);

	rc = usbip_recv(sockfd, &op_common, sizeof(op_common));

	if (rc < 0) {

		dbg("usbip_recv failed: %d", rc);

		goto err;

	}



	PACK_OP_COMMON(0, &op_common);



	if (op_common.version != USBIP_VERSION) {

		err("version mismatch, %d %d", op_common.version, USBIP_VERSION);

		dbg("version mismatch: %d %d", op_common.version,

		    USBIP_VERSION);

		goto err;

	}
@@ -142,13 +153,14 @@ int usbip_recv_op_common(int sockfd, uint16_t *code) 
		break;

	default:

		if (op_common.code != *code) {

				info("unexpected pdu %d for %d", op_common.code, *code);

			dbg("unexpected pdu %#0x for %#0x", op_common.code,

			    *code);

			goto err;

		}

	}



	if (op_common.status != ST_OK) {

		info("request failed at peer, %d", op_common.status);

		dbg("request failed at peer: %d", op_common.status);

		goto err;

	}
@@ -159,7 +171,6 @@ int usbip_recv_op_common(int sockfd, uint16_t *code) 
	return -1;

}





int usbip_set_reuseaddr(int sockfd)

{

	const int val = 1;
@@ -167,7 +178,7 @@ int usbip_set_reuseaddr(int sockfd) 


	ret = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));

	if (ret < 0)

		err("setsockopt SO_REUSEADDR");

		dbg("setsockopt: SO_REUSEADDR");



	return ret;

}
@@ -179,7 +190,7 @@ int usbip_set_nodelay(int sockfd) 


	ret = setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));

	if (ret < 0)

		err("setsockopt TCP_NODELAY");

		dbg("setsockopt: TCP_NODELAY");



	return ret;

}
@@ -191,7 +202,7 @@ int usbip_set_keepalive(int sockfd) 


	ret = setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));

	if (ret < 0)

		err("setsockopt SO_KEEPALIVE");

		dbg("setsockopt: SO_KEEPALIVE");



	return ret;

}
@@ -199,7 +210,7 @@ int usbip_set_keepalive(int sockfd) 
/*

 * IPv6 Ready

 */

int usbip_net_tcp_connect(char *hostname, char *port)

int usbip_net_tcp_connect(char *hostname, char *service)

{

	struct addrinfo hints, *res, *rp;

	int sockfd;
@@ -210,9 +221,9 @@ int usbip_net_tcp_connect(char *hostname, char *port) 
	hints.ai_socktype = SOCK_STREAM;



	/* get all possible addresses */

	ret = getaddrinfo(hostname, port, &hints, &res);

	ret = getaddrinfo(hostname, service, &hints, &res);

	if (ret < 0) {

		dbg("getaddrinfo: %s port %s: %s", hostname, port,

		dbg("getaddrinfo: %s service %s: %s", hostname, service,

		    gai_strerror(ret));

		return ret;

	}