summaryrefslogtreecommitdiff
path: root/i/simulotron/src/gs/test_gs.cc
diff options
context:
space:
mode:
authorhaller2005-12-19 21:56:10 +0000
committerhaller2005-12-19 21:56:10 +0000
commit001f91e6ddce33aec769348adc55f0c0b0c09534 (patch)
treeceb99a0da1318c3033aa86d697cc580f023ace61 /i/simulotron/src/gs/test_gs.cc
parentf6ff855101ae3d98fff31c33726e852f2d505ffe (diff)
* changement sans interet dans comc
* Codage de aiguillage en cours * Ajout de fonctionnalité de traitement à GSMessage * Remaniement des constructeur de GSTransmitter * nettoyage et modification du test des gs
Diffstat (limited to 'i/simulotron/src/gs/test_gs.cc')
-rw-r--r--i/simulotron/src/gs/test_gs.cc38
1 files changed, 13 insertions, 25 deletions
diff --git a/i/simulotron/src/gs/test_gs.cc b/i/simulotron/src/gs/test_gs.cc
index 108c000..7416949 100644
--- a/i/simulotron/src/gs/test_gs.cc
+++ b/i/simulotron/src/gs/test_gs.cc
@@ -23,20 +23,14 @@
*
* }}} */
-#include "socket/address.hh"
#include "socket/socket_server.hh"
-#include "socket/socket_client.hh"
#include "gs/gs_transmitter.hh"
#include "gs/gs_message.hh"
-#include "utils/errno_exception.hh"
+#include <string>
#include <iostream>
-#include <stdexcept>
#include <sys/wait.h>
-// Adress useful
-Address adr;
-Address adr2;
//Chaine et char de test
const std::string strDepart = "J'aime la prog système.";
std::string strDest;
@@ -62,7 +56,7 @@ int main(void)
//retour des test
int resultClient, resultServer;
// Création de la socket serveur;
- SocketServer sockServ(Address(4242));
+ SocketServer sockServ(std::string(),4242);
// Mise en écoute du socket serveur
sockServ.listen(12);
// On crée le fork du client
@@ -90,10 +84,8 @@ int main(void)
int testGSServer(SocketServer & sockServ)
{
- // Acceptation d'une connection
- SocketClient sockFork(sockServ);
// Création du transmitter
- GSTransmitter gst(sockFork);
+ GSTransmitter gst(sockServ);
// Reception des messages
// une string
GSMessage gsm;
@@ -205,29 +197,25 @@ void testGSClient(int pauseMode)
sleep (10);
try
{
- // Création de la socket client
- SocketClient sockClient;
- // Demande de connection
- sockClient.connect(Address(std::string("localhost"), 4242));
// Création du transmitter
- GSTransmitter gst(sockClient);
+ GSTransmitter gst(std::string("127.0.0.1"), 4242);
GSMessage g1,g2,g3,g4,g5,g6,g7;
- g1.writeGS(strDepart.data(), strDepart.size());
+ g1.appendGS(strDepart.data(), strDepart.size());
gst.putGS(g1);
- g2.writeGS(&a, sizeof(char));
+ g2.appendGS(&a, sizeof(char));
gst.putGS(g2);
- g3.writeGS(&s1, sizeof(short));
+ g3.appendGS(&s1, sizeof(short));
gst.putGS(g3);
- g4.writeGS(&i1, sizeof(int));
+ g4.appendGS(&i1, sizeof(int));
gst.putGS(g4);
- g5.writeGS(&i3, sizeof(int));
+ g5.appendGS(&i3, sizeof(int));
gst.putGS(g5);
- g6.writeGS(&l1, sizeof(long));
+ g6.appendGS(&l1, sizeof(long));
gst.putGS(g6);
- g7.writeGS(&s1, sizeof(short));
- g7.writeGS(&l1, sizeof(long));
- g7.writeGS(&i3, sizeof(int));
+ g7.appendGS(&l1, sizeof(long));
+ g7.insertFrontGS(&s1, sizeof(short));
+ g7.appendGS(&i3, sizeof(int));
gst.putGS(g7);
}
catch(std::exception & chier)