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.13 and 1.22

version 1.13, 2010/04/21 13:45:49	version 1.22, 2010/08/09 13:51:47
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.15	RPL/2 (R) version 4.0.18
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2010 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 20	Line 20
*/	*/


#include "rpl.conv.h"	#include "rpl-conv.h"


/*	/*
Line 124 instruction_while(struct_processus *s_et	Line 124 instruction_while(struct_processus *s_et
void	void
instruction_warranty(struct_processus *s_etat_processus)	instruction_warranty(struct_processus *s_etat_processus)
{	{
# include "garanties.conv.h"	# include "garanties-conv.h"

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;

Line 420 instruction_write(struct_processus *s_et	Line 420 instruction_write(struct_processus *s_et
struct sigaction registre;	struct sigaction registre;

struct sockaddr_in adresse_ipv4;	struct sockaddr_in adresse_ipv4;
	# ifdef IPV6
struct sockaddr_in6 adresse_ipv6;	struct sockaddr_in6 adresse_ipv6;
	# endif
struct sockaddr_un adresse_unix;	struct sockaddr_un adresse_unix;

struct flock lock;	struct flock lock;
Line 1634 instruction_write(struct_processus *s_et	Line 1636 instruction_write(struct_processus *s_et
&(adresse[12]), &(adresse[13]), &(adresse[14]),	&(adresse[12]), &(adresse[13]), &(adresse[14]),
&(adresse[15]), &port)== 17)	&(adresse[15]), &port)== 17)
{ // Adresse IPv6	{ // Adresse IPv6
	# ifdef IPV6
memset(&adresse_ipv6, 0, sizeof(adresse_ipv6));	memset(&adresse_ipv6, 0, sizeof(adresse_ipv6));
adresse_ipv6.sin6_family = AF_INET6;	adresse_ipv6.sin6_family = AF_INET6;
adresse_ipv6.sin6_port = htons((uint16_t) port);	adresse_ipv6.sin6_port = htons((uint16_t) port);
Line 1698 instruction_write(struct_processus *s_et	Line 1701 instruction_write(struct_processus *s_et
return;	return;
}	}
}	}
	# else
	if ((*s_etat_processus).langue == 'F')
	{
	printf("+++Attention : Support du protocole"
	" IPv6 indisponble\n");
	}
	else
	{
	printf("+++Attention : IPv6 support "
	"unavailable\n");
	}
	# endif
}	}
else	else
{	{
Line 2623 instruction_wfsock(struct_processus *s_e	Line 2638 instruction_wfsock(struct_processus *s_e
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

struct sockaddr_in adresse_ipv4;	struct sockaddr_in adresse_ipv4;
	# ifdef IPV6
struct sockaddr_in6 adresse_ipv6;	struct sockaddr_in6 adresse_ipv6;
	# endif

unsigned long i;	unsigned long i;

Line 2789 instruction_wfsock(struct_processus *s_e	Line 2806 instruction_wfsock(struct_processus *s_e
else if ((((struct_socket ) (*s_objet_resultat).objet)).domaine ==	else if ((((struct_socket ) (*s_objet_resultat).objet)).domaine ==
PF_INET6)	PF_INET6)
{	{
	# ifdef IPV6
longueur = sizeof(adresse_ipv6);	longueur = sizeof(adresse_ipv6);

do	do
Line 2892 instruction_wfsock(struct_processus *s_e	Line 2910 instruction_wfsock(struct_processus *s_e
.objet)).adresse_distante, "%s(%u)",	.objet)).adresse_distante, "%s(%u)",
(((struct_socket ) (*s_objet_resultat)	(((struct_socket ) (*s_objet_resultat)
.objet)).adresse_distante, ntohs(adresse_ipv6.sin6_port));	.objet)).adresse_distante, ntohs(adresse_ipv6.sin6_port));
	# else
	if ((*s_etat_processus).langue == 'F')
	{
	printf("+++Attention : Support du protocole"
	" IPv6 indisponble\n");
	}
	else
	{
	printf("+++Attention : IPv6 support "
	"unavailable\n");
	}
	# endif
}	}
else	else
{	{

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.13
changed lines
	Added in v.1.22