bfu/3MICTCP
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replaced a few calls to bzero and bcopy by memset and memcpy respectively.

Browse source 
Replaced the use of struct timeval by POSIX compliant struct timespec.
This commit is contained in:
Nicolas Van Wambeke 2016-06-19 16:10:38 +02:00
parent ddeca822aa
commit 31e585aca8
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/api/mictcp_core.c
View file

@ -1,4 +1,6 @@
#include <api/mictcp_core.h> #include <api/mictcp_core.h>
#include <sys/time.h>
#include <time.h>
#include <pthread.h> #include <pthread.h>
#include <strings.h> #include <strings.h>
@ -59,7 +61,7 @@ int initialize_components(start_mode mode)
remote_addr.sin_family = AF_INET; remote_addr.sin_family = AF_INET;
remote_addr.sin_port = htons(API_SC_Port); remote_addr.sin_port = htons(API_SC_Port);
hp = gethostbyname("localhost"); hp = gethostbyname("localhost");
bcopy ( hp->h_addr, &(remote_addr.sin_addr.s_addr), hp->h_length); memcpy (&(remote_addr.sin_addr.s_addr), hp->h_addr, hp->h_length);
remote_size = sizeof(remote_addr); remote_size = sizeof(remote_addr);
initialized = 1; initialized = 1;
} }
@ -74,7 +76,7 @@ int initialize_components(start_mode mode)
remote_addr.sin_family = AF_INET; remote_addr.sin_family = AF_INET;
remote_addr.sin_port = htons(API_CS_Port); remote_addr.sin_port = htons(API_CS_Port);
hp = gethostbyname("localhost"); hp = gethostbyname("localhost");
bcopy ( hp->h_addr, &(remote_addr.sin_addr.s_addr), hp->h_length); memcpy (&(remote_addr.sin_addr.s_addr), hp->h_addr, hp->h_length);
remote_size = sizeof(remote_addr); remote_size = sizeof(remote_addr);
memset((char *) &local_addr, 0, sizeof(local_addr)); memset((char *) &local_addr, 0, sizeof(local_addr));
@ -320,9 +322,9 @@ unsigned long get_now_time_msec()
unsigned long get_now_time_usec() unsigned long get_now_time_usec()
{ {
struct timeval now_time; struct timespec now_time;
gettimeofday(&now_time, NULL); clock_gettime( CLOCK_REALTIME, &now_time);
return ((unsigned long)(now_time.tv_usec +(now_time.tv_sec * 1000000))); return ((unsigned long)((now_time.tv_nsec / 1000) + (now_time.tv_sec * 1000000)));
} }
int min_size(int s1, int s2) int min_size(int s1, int s2)

19
src/apps/gateway.c
View file

@ -53,7 +53,7 @@ void udp_to_tcp(struct sockaddr_in listen_on, struct sockaddr_in transmit_to, in
/* Main activity loop, we never exit this, user terminates with SIGKILL */ /* Main activity loop, we never exit this, user terminates with SIGKILL */
while(1) { while(1) {
bzero(buffer,MAX_UDP_SEGMENT_SIZE); memset(buffer, 0, MAX_UDP_SEGMENT_SIZE);
n = recvfrom(listen_sockfd, buffer, MAX_UDP_SEGMENT_SIZE, 0, (struct sockaddr *) &cliaddr, &len); n = recvfrom(listen_sockfd, buffer, MAX_UDP_SEGMENT_SIZE, 0, (struct sockaddr *) &cliaddr, &len);
if (n < 0) { if (n < 0) {
@ -135,7 +135,7 @@ void file_to_tcp(struct sockaddr_in listen_on, struct sockaddr_in transmit_to, i
/* Main activity loop, we never exit this, user terminates with SIGKILL */ /* Main activity loop, we never exit this, user terminates with SIGKILL */
while(!feof(fd)) { while(!feof(fd)) {
bzero(buffer,MAX_UDP_SEGMENT_SIZE); memset(buffer, 0, MAX_UDP_SEGMENT_SIZE);
n = fread(&currentTime, 1, sizeof(struct timespec), fd); n = fread(&currentTime, 1, sizeof(struct timespec), fd);
if(firstValue > 0) { if(firstValue > 0) {
@ -218,7 +218,7 @@ void file_to_mictcp(struct sockaddr_in listen_on, struct sockaddr_in transmit_to
/* Main activity loop, we exit this at the end of the file */ /* Main activity loop, we exit this at the end of the file */
while(active) { while(active) {
bzero(buffer, MAX_UDP_SEGMENT_SIZE); memset(buffer, 0, MAX_UDP_SEGMENT_SIZE);
n = fread(&currentTimeFile, 1, sizeof(struct timespec), fd); n = fread(&currentTimeFile, 1, sizeof(struct timespec), fd);
if(firstValue > 0) { if(firstValue > 0) {
@ -311,7 +311,7 @@ void udp_to_mictcp(struct sockaddr_in listen_on, struct sockaddr_in transmit_to)
/* Main activity loop, we never exit this, user terminates with SIGKILL */ /* Main activity loop, we never exit this, user terminates with SIGKILL */
while(1) { while(1) {
bzero(buffer, MAX_UDP_SEGMENT_SIZE); memset(buffer, 0, MAX_UDP_SEGMENT_SIZE);
n = recvfrom(listen_sockfd, buffer, MAX_UDP_SEGMENT_SIZE, 0, (struct sockaddr *) &cliaddr, &len); n = recvfrom(listen_sockfd, buffer, MAX_UDP_SEGMENT_SIZE, 0, (struct sockaddr *) &cliaddr, &len);
if (n < 0) { if (n < 0) {
@ -383,7 +383,7 @@ void mictcp_to_udp(struct sockaddr_in listen_on, struct sockaddr_in transmit_to)
int k; int k;
for(k=0; k<CUMULATED_BUFF_NB; k++) for(k=0; k<CUMULATED_BUFF_NB; k++)
{ {
bzero(Buff[k], MAX_UDP_SEGMENT_SIZE); memset(Buff[k], 0, MAX_UDP_SEGMENT_SIZE);
} }
for(k=0; k<CUMULATED_BUFF_NB; k++) for(k=0; k<CUMULATED_BUFF_NB; k++)
@ -429,17 +429,18 @@ int main(int argc, char ** argv) {
/* What sockaddr should this program listen on? */ /* What sockaddr should this program listen on? */
/* Always on port 1234 (data from VLC arrives there using UDP) */ /* Always on port 1234 (data from VLC arrives there using UDP) */
struct sockaddr_in serv_addr; struct sockaddr_in serv_addr;
bzero((char *) &serv_addr, sizeof(serv_addr)); memset((char *) &serv_addr, 0, sizeof(serv_addr));
serv_addr.sin_family = AF_INET; serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = INADDR_ANY; serv_addr.sin_addr.s_addr = INADDR_ANY;
serv_addr.sin_port = htons(1234); serv_addr.sin_port = htons(1234);
/* Where should this program send the received data? */ /* Where should this program send the received data? */
struct sockaddr_in dest_addr; struct sockaddr_in dest_addr;
bzero((char *) &dest_addr, sizeof(dest_addr)); memset((char *) &dest_addr, 0, sizeof(dest_addr));
dest_addr.sin_family = AF_INET; dest_addr.sin_family = AF_INET;
struct hostent * hp = gethostbyname("127.0.0.1"); struct hostent * hp = gethostbyname("127.0.0.1");
bcopy ( hp->h_addr, &(dest_addr.sin_addr.s_addr), hp->h_length); memcpy (&(dest_addr.sin_addr.s_addr), hp->h_addr, hp->h_length);
dest_addr.sin_port = htons(1234); dest_addr.sin_port = htons(1234);
extern int optind; extern int optind;
@ -488,7 +489,7 @@ int main(int argc, char ** argv) {
if(puits == 0) { if(puits == 0) {
hp = gethostbyname(argv[0]); hp = gethostbyname(argv[0]);
bcopy ( hp->h_addr, &(dest_addr.sin_addr.s_addr), hp->h_length); memcpy (&(dest_addr.sin_addr.s_addr), hp->h_addr, hp->h_length);
dest_addr.sin_port = htons(atoi(argv[1])); dest_addr.sin_port = htons(atoi(argv[1]));
} else { } else {
serv_addr.sin_port = htons(atoi(argv[0])); serv_addr.sin_port = htons(atoi(argv[0]));