--- ansh/src/client2.c	2011/10/10 09:11:48	1.1.1.1.2.1
+++ ansh/src/client2.c	2011/10/10 13:56:30	1.1.1.1.2.2
@@ -3,14 +3,14 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: client2.c,v 1.1.1.1.2.1 2011/10/10 09:11:48 misho Exp $
+ * $Id: client2.c,v 1.1.1.1.2.2 2011/10/10 13:56:30 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
 
 
 static int
-SetRemoteWinz(int h, u_short id, struct ether_addr *ea, u_char *buf, int buflen)
+SetRemoteWinz(int h, struct ether_addr *ea, u_char *buf, int buflen)
 {
 	u_short *pos = (u_short*) buf;
 	struct winsize ws;
@@ -27,14 +27,14 @@ SetRemoteWinz(int h, u_short id, struct ether_addr *ea
 	pos[1] = htons(ws.ws_col);
 	pos[2] = htons(ws.ws_xpixel);
 	pos[3] = htons(ws.ws_ypixel);
-	if (pktSend(h, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, ea) == -1)
+	if (pktSend(h, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, ea) == -1)
 		return -1;
 
 	return 0;
 }
 
 int
-ConnectL2(int h, u_short id, struct ether_addr *ea, int len)
+ConnectL2(int h, struct ether_addr *ea, int len)
 {
 	fd_set rfd;
 	struct ether_header eth;
@@ -51,7 +51,7 @@ ConnectL2(int h, u_short id, struct ether_addr *ea, in
 		return -1;
 	}
 
-	if (SetRemoteWinz(h, id, ea, buf, len) == -1) {
+	if (SetRemoteWinz(h, ea, buf, len) == -1) {
 		free(buf);
 		return -1;
 	}
@@ -113,7 +113,7 @@ ConnectL2(int h, u_short id, struct ether_addr *ea, in
 				}
 			}
 
-			rlen = pktSend(h, id, ANSH_FLG_CPOUT, Crypted, buf, rlen, ea);
+			rlen = pktSend(h, ANSH_FLG_CPOUT, Crypted, buf, rlen, ea);
 			if (rlen == ANSH_FLG_ERR) {
 				ret = -1;
 				break;
@@ -126,8 +126,8 @@ ConnectL2(int h, u_short id, struct ether_addr *ea, in
 				ret = -1;
 				break;
 			}
-			if (ntohs(eth.ether_type) != id) {
-				VERB(4) LOG("different service id %d / %d\n", ntohs(eth.ether_type), id);
+			if (ntohs(eth.ether_type) != ANSH_ID) {
+				VERB(4) LOG("different service id %d / %d\n", eth.ether_type, ANSH_ID);
 				continue;
 			}
 			if (flg == ANSH_FLG_EOF) {