Cherrypick branch

1 files changed, 18 insertions, 18 deletions

diff --git a/programs/chargen_server_upcall.c b/programs/chargen_server_upcall.c
index 0b01ed88..06056bc0 100644
--- a/programs/chargen_server_upcall.c
+++ b/programs/chargen_server_upcall.c
@@ -67,14 +67,14 @@ initBuffer(void) {
 
 unsigned int signCounter = 0;
 static void
-handle_upcall(struct socket *sock, void *data, int flgs);
+handle_upcall(struct socket *upcall_socket, void *upcall_data, int upcall_flags);
 
 static void
-handle_accept(struct socket *sock, void *data, int flags)
+handle_accept(struct socket *upcall_socket, void *upcall_data, int upcall_flags)
 {
 	struct socket *conn_sock;
 
-	if (((conn_sock = usrsctp_accept(sock, NULL, NULL)) == NULL)
+	if (((conn_sock = usrsctp_accept(upcall_socket, NULL, NULL)) == NULL)
 	    && (errno != EINPROGRESS)) {
 		perror("usrsctp_accept");
 		return;
@@ -85,9 +85,9 @@ handle_accept(struct socket *sock, void *data, int flags)
 }
 
 static void
-handle_upcall(struct socket *sock, void *data, int flgs)
+handle_upcall(struct socket *upcall_socket, void *upcall_data, int upcall_flags)
 {
-	int events = usrsctp_get_events(sock);
+	int events = usrsctp_get_events(upcall_socket);
 
 	if (events & SCTP_EVENT_READ && !send_done) {
 		char *buf;
@@ -95,31 +95,31 @@ handle_upcall(struct socket *sock, void *data, int flgs)
 		ssize_t n;
 		struct sockaddr_storage addr;
 		buf = malloc(BUFFERSIZE);
-		int flags = 0;
+		int recv_flags = 0;
 		socklen_t len = (socklen_t)sizeof(struct sockaddr_storage);
 		unsigned int infotype = 0;
 		socklen_t infolen = sizeof(struct sctp_recvv_rn);
 		memset(&rn, 0, sizeof(struct sctp_recvv_rn));
 
-		n = usrsctp_recvv(sock, buf, BUFFERSIZE, (struct sockaddr *) &addr, &len, (void *)&rn,
-				 &infolen, &infotype, &flags);
+		n = usrsctp_recvv(upcall_socket, buf, BUFFERSIZE, (struct sockaddr *) &addr, &len, (void *)&rn,
+				 &infolen, &infotype, &recv_flags);
 		if (n < 0) {
 			perror("usrsctp_recvv");
 			done = 1;
-			usrsctp_close(sock);
-			printf("client socket %p closed\n", (void *)sock);
-			sock = NULL;
+			usrsctp_close(upcall_socket);
+			printf("client socket %p closed\n", (void *)upcall_socket);
+			upcall_socket = NULL;
 			return;
 		}
 		if (n == 0) {
 			done = 1;
-			usrsctp_close(sock);
-			printf("client socket %p closed\n", (void *)sock);
-			sock = NULL;
+			usrsctp_close(upcall_socket);
+			printf("client socket %p closed\n", (void *)upcall_socket);
+			upcall_socket = NULL;
 			return;
 		}
 		if (n > 0) {
-			if (flags & MSG_NOTIFICATION) {
+			if (recv_flags & MSG_NOTIFICATION) {
 				printf("Notification of length %d received.\n", (int)n);
 			} else {
 				printf("data of size %d received\n", (int)n);
@@ -135,11 +135,11 @@ handle_upcall(struct socket *sock, void *data, int flgs)
 		snd_info.snd_ppid = 0;
 		snd_info.snd_context = 0;
 		snd_info.snd_assoc_id = 0;
-		if (usrsctp_sendv(sock, buffer, strlen(buffer), NULL, 0, &snd_info, (socklen_t)sizeof(struct sctp_sndinfo), SCTP_SENDV_SNDINFO, 0) < 0) {
+		if (usrsctp_sendv(upcall_socket, buffer, strlen(buffer), NULL, 0, &snd_info, (socklen_t)sizeof(struct sctp_sndinfo), SCTP_SENDV_SNDINFO, 0) < 0) {
 			if (errno != EAGAIN) {
 				send_done = 1;
-				usrsctp_close(sock);
-				printf("client socket %p closed\n", (void *)sock);
+				usrsctp_close(upcall_socket);
+				printf("client socket %p closed\n", (void *)upcall_socket);
 				return;
 			}
 		}