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.2.2.1 and 1.3.2.2

version 1.2.2.1, 2011/10/31 09:46:18	version 1.3.2.2, 2012/04/05 14:18:55
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 128 PrepareL2(const char psDev, int bpflen)	Line 128 PrepareL2(const char psDev, int bpflen)
}	}

int	int
PrepareL3(const struct sockaddr sa, int bpflen)	PrepareL3(const io_sockaddr_t sa, int bpflen)
{	{
int h, n = 1;	int h, n = 1;

FTRACE(3);	FTRACE(3);
	assert(sa);

h = socket(sa->sa_family, SOCK_RAW, IPPROTO_ICMP);	h = socket(sa->sa.sa_family ? sa->sa.sa_family : AF_INET, SOCK_RAW, IPPROTO_ICMP);
if (h == -1) {	if (h == -1) {
printf("Error:: Cant open raw socket #%d - %s\n", errno, strerror(errno));	printf("Error:: Cant open raw socket #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
Line 146 PrepareL3(const struct sockaddr sa, int bpflen)	Line 147 PrepareL3(const struct sockaddr sa, int bpflen)
return -1;	return -1;
}	}
*/	*/
if (sa && bind(h, sa, sizeof(struct sockaddr)) == -1) {	if (sa->sa.sa_family && bind(h, &sa->sa, sa->sa.sa_len) == -1) {
printf("Error:: Cant bind to raw socket #%d - %s\n", errno, strerror(errno));	printf("Error:: Cant bind to raw socket #%d - %s\n", errno, strerror(errno));
close(h);	close(h);
return -1;	return -1;
Line 162 PrepareL3(const struct sockaddr sa, int bpflen)	Line 163 PrepareL3(const struct sockaddr sa, int bpflen)

char	char
icmpRecv(int s, u_int * __restrict seq, u_short * __restrict id, u_int * __restrict crypted,	icmpRecv(int s, u_int * __restrict seq, u_short * __restrict id, u_int * __restrict crypted,
u_char * __restrict data, int * __restrict datlen, struct sockaddr sa, socklen_t salen)	u_char * __restrict data, int * __restrict datlen, io_sockaddr_t sa, socklen_t salen)
{	{
int ret = 0;	int ret = 0;
struct icmp *icmp;	struct icmp *icmp;
Line 170 icmpRecv(int s, u_int * __restrict seq, u_short * __re	Line 171 icmpRecv(int s, u_int * __restrict seq, u_short * __re
u_char buf[USHRT_MAX] = { 0 };	u_char buf[USHRT_MAX] = { 0 };
u_int crc;	u_int crc;

ret = recvfrom(s, buf, sizeof buf, 0, sa, salen);	ret = recvfrom(s, buf, sizeof buf, 0, &sa->sa, salen);
if (ret == -1) {	if (ret == -1) {
ERR("Receive recvfrom() #%d - %s", errno, strerror(errno));	ERR("Receive recvfrom() #%d - %s", errno, strerror(errno));
return ANSH_FLG_ERR;	return ANSH_FLG_ERR;
Line 236 icmpRecv(int s, u_int * __restrict seq, u_short * __re	Line 237 icmpRecv(int s, u_int * __restrict seq, u_short * __re

int	int
icmpSend(int s, u_int seq, u_short id, char flg, u_int crypted, u_char *data, int datlen,	icmpSend(int s, u_int seq, u_short id, char flg, u_int crypted, u_char *data, int datlen,
struct sockaddr *sa, socklen_t salen)	io_sockaddr_t *sa, socklen_t salen)
{	{
u_char *pos, buf[USHRT_MAX] = { 0 };	u_char *pos, buf[USHRT_MAX] = { 0 };
struct icmp *icmp;	struct icmp *icmp;
Line 269 icmpSend(int s, u_int seq, u_short id, char flg, u_int	Line 270 icmpSend(int s, u_int seq, u_short id, char flg, u_int
icmp->icmp_cksum = crcIP(buf, sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen);	icmp->icmp_cksum = crcIP(buf, sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen);

if ((ret = sendto(s, buf, sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen,	if ((ret = sendto(s, buf, sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen,
0, sa, salen)) == -1) {	0, &sa->sa, salen)) == -1) {
ERR("Send sendto() #%d - %s", errno, strerror(errno));	ERR("Send sendto() #%d - %s", errno, strerror(errno));
return ANSH_FLG_ERR;	return ANSH_FLG_ERR;
} else	} else
Line 284 icmpSend(int s, u_int seq, u_short id, char flg, u_int	Line 285 icmpSend(int s, u_int seq, u_short id, char flg, u_int
}	}

static int	static int
_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char data, int datlen, struct io_ether_addr ea)	_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char data, int datlen, io_ether_addr_t ea)
{	{
u_char pos, str, buf[USHRT_MAX] = { 0 };	u_char pos, str, buf[USHRT_MAX] = { 0 };
struct ether_header e = (struct ether_header) buf;	struct ether_header e = (struct ether_header) buf;
Line 533 cryptBuffer(u_char *buf, int rlen, u_int ctr)	Line 534 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.2.2.1
changed lines
	Added in v.1.3.2.2