rpl/src/instructions_w1.c - diff

Return to instructions_w1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_w1.c between versions 1.110 and 1.115

version 1.110, 2018/06/01 09:57:28	version 1.115, 2019/02/09 13:36:41
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.29	RPL/2 (R) version 4.1.31
Copyright (C) 1989-2018 Dr. BERTRAND Joël	Copyright (C) 1989-2019 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 1734 instruction_write(struct_processus *s_et	Line 1734 instruction_write(struct_processus *s_et
{ // Sockets connectées	{ // Sockets connectées

action.sa_handler = SIG_IGN;	action.sa_handler = SIG_IGN;
action.sa_flags = SA_ONSTACK;	action.sa_flags = 0;

if (sigaction(SIGPIPE, &action, &registre) != 0)	if (sigaction(SIGPIPE, &action, &registre) != 0)
{	{
Line 3201 instruction_wfsock(struct_processus *s_e	Line 3201 instruction_wfsock(struct_processus *s_e
struct sockaddr_in6 adresse_ipv6;	struct sockaddr_in6 adresse_ipv6;
# endif	# endif

unsigned long i;

if ((*s_etat_processus).affichage_arguments == 'Y')	if ((*s_etat_processus).affichage_arguments == 'Y')
{	{
printf("\n WFSOCK ");	printf("\n WFSOCK ");
Line 3566 instruction_wfsock(struct_processus *s_e	Line 3564 instruction_wfsock(struct_processus *s_e
} while(drapeau == d_faux);	} while(drapeau == d_faux);

if (((((struct_socket ) (*s_objet_resultat).objet))	if (((((struct_socket ) (*s_objet_resultat).objet))
.adresse_distante = malloc(55 *	.adresse_distante = malloc(47 *
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 3574 instruction_wfsock(struct_processus *s_e	Line 3572 instruction_wfsock(struct_processus *s_e
return;	return;
}	}

(((struct_socket ) (*s_objet_resultat).objet))
.adresse_distante = d_code_fin_chaine;

for(i = 0; i < 16; i++)
{
sprintf((((struct_socket ) (*s_objet_resultat)
.objet)).adresse_distante, (i == 0) ? "%s%X"
: "%s:%X", (((struct_socket ) (*s_objet_resultat)
.objet)).adresse_distante,
adresse_ipv6.sin6_addr.s6_addr[i]);
}

sprintf((((struct_socket ) (*s_objet_resultat)	sprintf((((struct_socket ) (*s_objet_resultat)
.objet)).adresse_distante, "%s(%u)",
(((struct_socket ) (*s_objet_resultat)
.objet)).adresse_distante,	.objet)).adresse_distante,
	"%02X%02X:%02X%02X:%02X%02X:%02X%02X:"
	"%02X%02X:%02X%02X:%02X%02X:%02X%02X(%u)",
	adresse_ipv6.sin6_addr.s6_addr[0],
	adresse_ipv6.sin6_addr.s6_addr[1],
	adresse_ipv6.sin6_addr.s6_addr[2],
	adresse_ipv6.sin6_addr.s6_addr[3],
	adresse_ipv6.sin6_addr.s6_addr[4],
	adresse_ipv6.sin6_addr.s6_addr[5],
	adresse_ipv6.sin6_addr.s6_addr[6],
	adresse_ipv6.sin6_addr.s6_addr[7],
	adresse_ipv6.sin6_addr.s6_addr[8],
	adresse_ipv6.sin6_addr.s6_addr[9],
	adresse_ipv6.sin6_addr.s6_addr[10],
	adresse_ipv6.sin6_addr.s6_addr[11],
	adresse_ipv6.sin6_addr.s6_addr[12],
	adresse_ipv6.sin6_addr.s6_addr[13],
	adresse_ipv6.sin6_addr.s6_addr[14],
	adresse_ipv6.sin6_addr.s6_addr[15],
ntohs(adresse_ipv6.sin6_port));	ntohs(adresse_ipv6.sin6_port));
# else	# else
if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.110
changed lines
	Added in v.1.115