INSA/tsock
1
0
Fork 0
mirror of https://github.com/yoboujon/tsock.git synced 2025-06-08 14:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from yoboujon/yohan

Browse source 
Ajout de l'adresse ip et du port dans les paramètres.
This commit is contained in:
yoboujon 2023-01-13 11:07:13 +01:00 • committed by GitHub
commit ce8b44f3b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
header/puit.h
View file

@ -2,7 +2,7 @@
#define HEADER_PUIT
#include "tsock.h"
int launchPuit(int nombreMessage,int TailleMessage);
int launchPuit(int nombreMessage,int TailleMessage,int isTCP);
int receiveMultipleData(int nombreMessages, int tailleMessage, int sock, struct sockaddr_in socketStruct);
int exitMax(int var,int tailleMax);
#endif

2
header/source.h
View file

@ -2,7 +2,7 @@
#define HEADER_SOURCE
#include "tsock.h"
int launchSource(int nombreMessage);
int launchSource(int nombreMessage, int isTCP);
int sendMultipleData(int nombreMessages, int tailleMessage, int sock, struct sockaddr_in socketStruct);
#endif

4
header/tsock.h
View file

@ -10,10 +10,12 @@
#include <netdb.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
void setNbMessage(int * nb, int source);
void printInfo(int nb, int source);
void printInfo(int nb, int source, int portNumber, char ipAddress[]);
void initStructSocket(struct sockaddr_in *socketServerTemp, int source);
void getNonOtpArgs(char ** argv, int argc, int portNumber, char * ipAddress[]);
#define PORT_NUM 9000

33
src/main.c
View file

@ -4,24 +4,23 @@
int main (int argc, char **argv)
{
int c;
char usageChar[30]="usage: cmd [-p|-s][-n ##]\n";
char *ipAddress;
extern char *optarg;
extern int optind;
int nb_message = -1; /* Nb de messages à envoyer ou à recevoir, par défaut : 10 en émission, infini en réception */
int source = -1 ; /* 0=puits, 1=source */
int tailleMessage; // -l
while ((c = getopt(argc, argv, "pn:sl:")) != -1) {
int source = -1, nb_message = -1, c, tcp=1, port=9000, tailleMessage; /* Nb de messages à envoyer ou à recevoir, par défaut : 10 en émission, infini en réception */
while ((c = getopt(argc, argv, "pn:su")) != -1) {
switch (c) {
case 'p':
if (source != -1) {
printf("usage: cmd [-p|-s][-n ##]\n");
printf(usageChar);
exit(1);
}
source = 0;
break;
case 's':
if (source != -1) {
printf("usage: cmd [-p|-s][-n ##]\n");
printf(usageChar);
exit(1) ;
}
source = 1;
@ -33,28 +32,32 @@ int main (int argc, char **argv)
case 'n':
nb_message = atoi(optarg);
break;
case 'u':
tcp=0;
break;
default:
printf("usage: cmd [-p|-s][-n ##]\n");
printf(usageChar);
break;
}
}
if (source == -1) {
printf("usage: cmd [-p|-s][-n ##]\n");
printf("-p|-s non present !\n");
printf(usageChar);
exit(1);
}
getNonOtpArgs(argv, argc, port, &ipAddress);
setNbMessage(&nb_message,source);
printInfo(nb_message,source);
printInfo(nb_message,source,port,ipAddress);
if(source)
{
printf("Source : %d\n",nb_message);
launchSource(nb_message);
//printf("Source : %d\n",nb_message);
launchSource(nb_message,tcp);
}
else
{
printf("Puit : %d\n",nb_message);
launchPuit(nb_message,tailleMessage);
//printf("Puit : %d\n",nb_message);
launchPuit(nb_message,tailleMessage,tcp);
}
}

2
src/puit.c
View file

@ -1,6 +1,6 @@
#include "../header/puit.h"
int launchPuit(int nombreMessage,int tailleMessage)
int launchPuit(int nombreMessage,int tailleMessage,int isTCP)
{
int sock;
struct sockaddr_in socketPuit;

2
src/source.c
View file

@ -1,6 +1,6 @@
#include "../header/source.h"
int launchSource(int nombreMessage)
int launchSource(int nombreMessage, int isTCP)
{
int sock;
struct sockaddr_in socketSource;

13
src/tsock.c
View file

@ -8,16 +8,17 @@ void setNbMessage(int * nb, int source)
}
}
void printInfo(int nb, int source)
void printInfo(int nb, int source, int portNumber, char ipAddress[])
{
if(source)
{
printf("tsock lance en mode source, nombre de tampons à envoyer : %d\n", nb);
printf("tsock lance en mode source, nombre de tampons à envoyer : %d\nPort : %d\t Adresse IP : %s\n", nb, portNumber, ipAddress);
}
else
{
printf("tsock lance en mode puit, nombre de tampons à recevoir :");
nb != -1 ? printf("%d\n", nb) : printf("infini\n");
printf("Port : %d\n",portNumber);
}
}
@ -41,4 +42,12 @@ void initStructSocket(struct sockaddr_in *socketTempStruct, int source)
socketTempStruct->sin_addr.s_addr=INADDR_ANY;
}
}
void getNonOtpArgs(char ** argv, int argc, int portNumber, char ** ipAddress)
{
portNumber = atoi(argv[argc-2]);
*ipAddress = NULL;
*ipAddress = (char *)malloc(sizeof(argv[argc-1]));
strcpy(*ipAddress,argv[argc-1]);
}