ansh/src/utils.c - diff

Return to utils.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / ansh / src

Diff for /ansh/src/utils.c between versions 1.1.1.1.2.10 and 1.1.1.1.2.13

version 1.1.1.1.2.10, 2011/10/14 09:04:04	version 1.1.1.1.2.13, 2011/10/14 13:23:49
Line 120 PrepareL2(const char psDev, int bpflen)	Line 120 PrepareL2(const char psDev, int bpflen)
return -1;	return -1;
}	}

/*
n = fcntl(h, F_GETFL);	n = fcntl(h, F_GETFL);
fcntl(h, F_SETFL, n \| O_NONBLOCK);	fcntl(h, F_SETFL, n \| O_NONBLOCK);
*/

VERB(3) LOG("Openned device handle %d with bpf buflen %d", h, *bpflen);	VERB(3) LOG("Openned device handle %d with bpf buflen %d", h, *bpflen);
return h;	return h;
Line 208 icmpRecv(int s, u_int * __restrict seq, u_short * __re	Line 206 icmpRecv(int s, u_int * __restrict seq, u_short * __re
VERB(3) LOG("Channel SECURED:: Plain text communication not supported at this moment ...");	VERB(3) LOG("Channel SECURED:: Plain text communication not supported at this moment ...");
return ANSH_FLG_ERR;	return ANSH_FLG_ERR;
}	}
	if (ntohl(hdr->ansh_nonce) != *crypted)
	VERB(4) LOG("Detect change of nonce from %x to %x", *crypted, ntohl(hdr->ansh_nonce));

*crypted = ntohl(hdr->ansh_nonce);	*crypted = ntohl(hdr->ansh_nonce);
}	}
Line 386 _pkt_Recv(u_char * __restrict buf, int rlen, u_int * _	Line 386 _pkt_Recv(u_char * __restrict buf, int rlen, u_int * _
VERB(3) LOG("Channel SECURED:: Plain text communication not supported at this moment ...");	VERB(3) LOG("Channel SECURED:: Plain text communication not supported at this moment ...");
return ANSH_FLG_ERR;	return ANSH_FLG_ERR;
}	}
	if (ntohl(hdr->ansh_nonce) != *crypted)
	VERB(4) LOG("Detect change of nonce from %x to %x", *crypted, ntohl(hdr->ansh_nonce));

*crypted = ntohl(hdr->ansh_nonce);	*crypted = ntohl(hdr->ansh_nonce);
}	}
Line 513 cryptBuffer(u_char *buf, int rlen, u_int ctr)	Line 515 cryptBuffer(u_char *buf, int rlen, u_int ctr)
return NULL;	return NULL;

return str;	return str;
	}

	int
	stopProcess(sched_root_task_t * __restrict root, proc_head_t * __restrict h, pid_t pid, sched_task_func_t func)
	{
	struct tagProc *p;

	FTRACE(3);

	SLIST_FOREACH(p, h, proc_next)
	if (p->proc_pid == pid) {
	break;
	}
	VERB(3) LOG("pid=%d found=%p\n", pid, p);
	if (!p)
	return 1;

	ioFreePTY(p->proc_pty, p->proc_ttyname);
	if (p->proc_pty)
	schedCancelby(root, NULL, CRITERIA_FD, (void*) ((intptr_t) p->proc_pty), NULL);

	p->proc_pty = 0;
	p->proc_pid = 0;
	p->proc_seq = 0;
	p->proc_flg = ANSH_FLG_EOF;
	p->proc_rlen_[FD2NET] = 0;

	schedCallOnce(root, func, p, p->proc_sock);
	return 0;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1.2.10
changed lines
	Added in v.1.1.1.1.2.13