Push work done on MAC (e98261e7) · Commits · Plugtests / ITS Plugtests / ITS-Bridge

etc/client.conf

+4 −4

Original line number	Original line	Diff line number	Diff line
	# client.conf sample		# client.conf sample
	daemon_mode=0		daemon_mode=0
	mac_address=dc536045af7e		mac_address=90fd61e61902
	its_nic=wlp2s0		its_nic=en1

	udp_nic=eno1		udp_nic=en0
	udp_address=224.168.1.100		udp_address=224.168.1.101
	udp_protocol=multicast		udp_protocol=multicast
	udp_port=5000		udp_port=5000

etc/server.conf

+5 −5

Original line number	Original line	Diff line number	Diff line
	# server.conf sample		# server.conf sample
	daemon_mode=0		daemon_mode=0
	mac_address=024294b76804		mac_address=90fd61e61902
	its_nic=docker0		its_nic=en1

	udp_nic=docker0		udp_nic=en0
	udp_address=239.168.1.100		udp_address=224.168.1.100;224.168.1.101;224.168.1.102
	udp_protocol=multicast		udp_protocol=multicast
	udp_port=5001		udp_port=5000

include/utils.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,3 +66,5 @@ char* load_file (const char *p_filename);
	int32_t load_binary_file(const char p_filename, uint8_t* p_buffer, size_t* p_size);		int32_t load_binary_file(const char p_filename, uint8_t* p_buffer, size_t* p_size);

	int32_t save_configuration_file(const char p_filename, const char progname, ...);		int32_t save_configuration_file(const char p_filename, const char progname, ...);

			char** str_split(const char* p_string, const char p_separator);

src/its_bridge_client.c

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -118,19 +118,22 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	while (state != _exiting) {		while (state != _exiting) {
	/* Prepare UDP broadcast socket to transfer ITS traffic throught router level 3 */		/* Prepare UDP broadcast socket to transfer ITS traffic throught router level 3 */
	if ((socket_hd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {		if ((socket_hd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
	fprintf(stderr, "Failed to create UDP broadcast socket: %s.\n", strerror(errno));		fprintf(stderr, "Failed to create UDP socket: %s.\n", strerror(errno));
	goto error;		goto error;
	}		}
	/* Bind it to the specified NIC Ethernet */		/* Bind it to the specified NIC Ethernet */
	struct ifreq ifr;		struct ifreq ifr;
	memset(&ifr, 0, sizeof(ifr));		memset(&ifr, 0, sizeof(ifr));
	snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", udp_nic);		snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", udp_nic);
			#ifndef __APPLE__
	if (setsockopt(socket_hd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr.ifr_name, strlen(ifr.ifr_name)) < 0) {		if (setsockopt(socket_hd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr.ifr_name, strlen(ifr.ifr_name)) < 0) {
	fprintf(stderr, "Failed to bind socket to %s.\n", ifr.ifr_name);		fprintf(stderr, "Failed to set option SO_BINDTODEVICE:%s.\n", strerror(errno));
			shutdown(socket_hd, 2);
	close(socket_hd);		close(socket_hd);
	goto error;		goto error;
	}		}
	printf("Bound to device %s", ifr.ifr_name);		printf("Bound to device %s.\n", ifr.ifr_name);
			#endif
	/* Configure the udp_port and ip we want to send to */		/* Configure the udp_port and ip we want to send to */
	if (udp_protocol != NULL) {		if (udp_protocol != NULL) {
	if (strcmp(udp_protocol, "broadcast") == 0) {		if (strcmp(udp_protocol, "broadcast") == 0) {

src/its_bridge_server.c

+47 −14

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ extern state_t state;

	bool running = false;		bool running = false;
	int32_t socket_hd = -1;		int32_t socket_hd = -1;
			char** udp_addresses = NULL;

	#define PID_FILE_NAME "/var/run/its_bridge_server.pid"		#define PID_FILE_NAME "/var/run/its_bridge_server.pid"
	#define LOCK_FILE_NAME "/var/run/its_bridge_server.lock"		#define LOCK_FILE_NAME "/var/run/its_bridge_server.lock"
	@@ -28,6 +29,7 @@ int32_t socket_hd = -1;
	void sig_handler(int p_signal) {		void sig_handler(int p_signal) {
	printf(">>> sig_handler: signal=%d.\n", p_signal);		printf(">>> sig_handler: signal=%d.\n", p_signal);
	running = false;		running = false;
			shutdown(socket_hd, SHUT_RDWR);
	close(socket_hd);		close(socket_hd);
	socket_hd = -1;		socket_hd = -1;
	}		}
	@@ -38,7 +40,6 @@ void sig_usr1_handler(int p_signal) {
	}		}

	int main(const int32_t p_argc, char* const p_argv[]) {		int main(const int32_t p_argc, char* const p_argv[]) {

	/* Sanity check */		/* Sanity check */
	uid_t uid = getuid();		uid_t uid = getuid();
	if (geteuid() != uid) {		if (geteuid() != uid) {
	@@ -76,6 +77,12 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	if (udp_address == NULL) {		if (udp_address == NULL) {
	fprintf(stderr, "Failed to parse command line arguments: UDP address missing, exit.\n");		fprintf(stderr, "Failed to parse command line arguments: UDP address missing, exit.\n");
	return -1;		return -1;
			} else {
			udp_addresses = str_split(udp_address, ';');
			if (udp_addresses == NULL) {
			fprintf(stderr, "Failed to parse multicqst adresses (%s), exit.\n", udp_address);
			return -1;
			}
	}		}
	if (udp_port == 0) {		if (udp_port == 0) {
	fprintf(stderr, "Failed to parse command line arguments: UDP port missing, exit.\n");		fprintf(stderr, "Failed to parse command line arguments: UDP port missing, exit.\n");
	@@ -119,9 +126,10 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	}		}

	/* Create UDP brodcast listener */		/* Create UDP brodcast listener */
			struct ifreq ifr; /* Required for IP_DROP_MEMBERSHIP */
	socket_hd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);		socket_hd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
	if (socket_hd == -1) {		if (socket_hd == -1) {
	fprintf(stderr, "Failed to create UDP broadcast socket.\n");		fprintf(stderr, "Failed to create UDP socket: %s.\n", strerror(errno));
	goto error;		goto error;
	}		}
	/* allow multiple instances to receive copies of the multicast datagrams */		/* allow multiple instances to receive copies of the multicast datagrams */
	@@ -132,16 +140,17 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	goto error;		goto error;
	}		}
	/* Bind it to the specified NIC Ethernet */		/* Bind it to the specified NIC Ethernet */
	struct ifreq ifr;
	memset(&ifr, 0, sizeof(ifr));		memset(&ifr, 0, sizeof(ifr));
	ifr.ifr_addr.sa_family = AF_INET;		ifr.ifr_addr.sa_family = AF_INET;
	snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", udp_nic);		snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", udp_nic);
			#ifndef __APPLE__
	if (setsockopt(socket_hd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr.ifr_name, strlen(ifr.ifr_name)) < 0) {		if (setsockopt(socket_hd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr.ifr_name, strlen(ifr.ifr_name)) < 0) {
	fprintf(stderr, "Failed to bind socket to %s.\n", ifr.ifr_name);		fprintf(stderr, "Failed to bind to interface:%s.\n", strerror(errno));
	close(socket_hd);		close(socket_hd);
	goto error;		goto error;
	}		}
	printf("Bound to device %s.\n", ifr.ifr_name);		printf("Bound to device %s.\n", ifr.ifr_name);
			#endif
	/* Configure the udp_port and ip we want to receive from */		/* Configure the udp_port and ip we want to receive from */
	if (udp_protocol != NULL) {		if (udp_protocol != NULL) {
	if (strcmp(udp_protocol, "broadcast") == 0) {		if (strcmp(udp_protocol, "broadcast") == 0) {
	@@ -160,9 +169,10 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	}		}
	printf("Interface address for %s: %s\n", ifr.ifr_name, inet_ntoa(((struct sockaddr_in*)&ifr.ifr_addr)->sin_addr));		printf("Interface address for %s: %s\n", ifr.ifr_name, inet_ntoa(((struct sockaddr_in*)&ifr.ifr_addr)->sin_addr));
	/* Join the multicast group */		/* Join the multicast group */
			for (int32_t i = 0; *(udp_addresses + i); i++) {
	struct ip_mreq mreq = {0};		struct ip_mreq mreq = {0};
	mreq.imr_interface.s_addr = inet_addr(inet_ntoa(((struct sockaddr_in)&ifr.ifr_addr)->sin_addr)); / Local address */		mreq.imr_interface.s_addr = inet_addr(inet_ntoa(((struct sockaddr_in)&ifr.ifr_addr)->sin_addr)); / Local address */
	mreq.imr_multiaddr.s_addr = inet_addr(udp_address); /* IP multicast address of group */		mreq.imr_multiaddr.s_addr = inet_addr((udp_addresses + i)); / IP multicast address of group */
	printf("mreq.imr_interface.s_addr = %s.\n", inet_ntoa(mreq.imr_interface));		printf("mreq.imr_interface.s_addr = %s.\n", inet_ntoa(mreq.imr_interface));
	printf("mreq.imr_multiaddr.s_addr = %s.\n", inet_ntoa(mreq.imr_multiaddr));		printf("mreq.imr_multiaddr.s_addr = %s.\n", inet_ntoa(mreq.imr_multiaddr));
	if (setsockopt(socket_hd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mreq, sizeof(mreq)) < 0) {		if (setsockopt(socket_hd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mreq, sizeof(mreq)) < 0) {
	@@ -170,7 +180,9 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	close(socket_hd);		close(socket_hd);
	goto error;		goto error;
	}		}
	// FIXME Add IP_DROP_MEMBERSHIP		/* Do not free resource here - free((udp_addresses + i)); /
			}
			/* Do not free resource here - free(udp_addresses); */
	int32_t ttl = 16; // FIXME Use a parameter		int32_t ttl = 16; // FIXME Use a parameter
	if (setsockopt(socket_hd, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(ttl)) < 0) {		if (setsockopt(socket_hd, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(ttl)) < 0) {
	fprintf(stderr, "Failed to set option IP_MULTICAST_TTL: %s.\n", strerror(errno));		fprintf(stderr, "Failed to set option IP_MULTICAST_TTL: %s.\n", strerror(errno));
	@@ -214,6 +226,23 @@ int main(const int32_t p_argc, char* const p_argv[]) {

	pcap_close(device);		pcap_close(device);
	if (socket_hd != -1) {		if (socket_hd != -1) {
			if (strcmp(udp_protocol, "multicast") == 0) {
			/* Leave the multicast group */
			for (int32_t i = 0; *(udp_addresses + i); i++) {
			struct ip_mreq mreq = {0};
			mreq.imr_interface.s_addr = inet_addr(inet_ntoa(((struct sockaddr_in)&ifr.ifr_addr)->sin_addr)); / Local address */
			mreq.imr_multiaddr.s_addr = inet_addr((udp_addresses + i)); / IP multicast address of group */
			printf("mreq.imr_interface.s_addr = %s.\n", inet_ntoa(mreq.imr_interface));
			printf("mreq.imr_multiaddr.s_addr = %s.\n", inet_ntoa(mreq.imr_multiaddr));
			if (setsockopt(socket_hd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char*)&mreq, sizeof(mreq)) < 0) {
			fprintf(stderr, "Failed to set option IP_DROP_MEMBERSHIP: %s.\n", strerror(errno));
			continue;
			}
			free(*(udp_addresses + i));
			}
			free(udp_addresses);
			}
			shutdown(socket_hd, SHUT_RDWR);
	close(socket_hd);		close(socket_hd);
	socket_hd = -1;		socket_hd = -1;
	}		}
	@@ -242,6 +271,10 @@ int main(const int32_t p_argc, char* const p_argv[]) {
	return 0;		return 0;

	error:		error:
			for (int32_t i = 0; *(udp_addresses + i); i++) {
			free(*(udp_addresses + i));
			}
			free(udp_addresses);
	unlink(PID_FILE_NAME);		unlink(PID_FILE_NAME);
	unlink(LOCK_FILE_NAME);		unlink(LOCK_FILE_NAME);
	return -1;		return -1;

Admin message