|
10 | 10 | #include <cerrno> |
11 | 11 | #include <stdlib.h> |
12 | 12 | #include <string.h> |
| 13 | +#include <algorithm> |
13 | 14 | #include "UDPSocket.h" |
14 | 15 | #include "Datagram.h" |
15 | 16 |
|
16 | 17 | using namespace std; |
17 | 18 |
|
18 | | -const int MAXLINELEN=100; |
| 19 | +const int MAXLINELEN = 100; |
| 20 | + |
19 | 21 | bool handleInput(int in, UDPSocket &udp, string server, short port) { |
20 | | - bool eofInput = false; |
21 | | - char inbuf[MAXLINELEN]; |
22 | | - int readBytes=read(in,inbuf,MAXLINELEN); |
23 | | - if (readBytes > 0) { |
24 | | - // TODO: Testen ob user "." eingegeben hat und eofInput auf true setzen |
| 22 | + bool eofInput = false; |
| 23 | + char inbuf[MAXLINELEN]; |
| 24 | + int readBytes = read(in, inbuf, MAXLINELEN); |
| 25 | + |
| 26 | + if (readBytes > 0) { |
| 27 | + eofInput = readBytes == 2 && count(inbuf, inbuf + readBytes, '.'); |
25 | 28 |
|
26 | | -Datagram dg(string(inbuf,readBytes),port,server.data()); |
27 | | -udp.sendDatagram(dg); |
28 | | -} else { |
29 | | -if (readBytes < 0) { |
30 | | -cerr << "error reading stdin:" << strerror(errno) << endl; |
31 | | -} |
32 | | -eofInput=true; |
33 | | -//close(in); |
34 | | -cerr << "eof on input" << endl; |
35 | | -} |
36 | | -return eofInput; |
| 29 | +Datagram dg(string(inbuf,readBytes - 1), port,server.data()); |
| 30 | +udp.sendDatagram(dg); |
| 31 | +} else { |
| 32 | +if (readBytes < 0) { |
| 33 | +cerr << "error reading stdin:" << strerror(errno) << endl; |
| 34 | +} |
| 35 | +eofInput = true; |
| 36 | +//close(in); |
| 37 | +cerr << "eof on input" << endl; |
| 38 | +} |
| 39 | +return eofInput; |
37 | 40 | } |
38 | 41 |
|
39 | 42 | bool handleOutput(int out, UDPSocket &udp) { |
40 | | -bool eofSocket = false; |
41 | | -Datagram *dg = udp.directReceiveDatagram(); |
| 43 | +bool eofSocket = false; |
| 44 | +Datagram *dg = udp.directReceiveDatagram(); |
42 | 45 |
|
43 | | -if (dg) { |
44 | | -cout << dg->message << endl; |
45 | | -} else { |
46 | | -cerr << "error receiving datagram:" << strerror(errno) << endl; |
47 | | -eofSocket=true; |
48 | | -} |
49 | | -delete dg; |
50 | | -return eofSocket; |
| 46 | +if (dg) { |
| 47 | +cout << dg->message << endl; |
| 48 | +} else { |
| 49 | +cerr << "error receiving datagram:" << strerror(errno) << endl; |
| 50 | +eofSocket = true; |
| 51 | +} |
| 52 | +delete dg; |
| 53 | +return eofSocket; |
51 | 54 | } |
52 | 55 |
|
53 | | -void clientcomm(int in,string server, short port, string nickname) { |
54 | | -UDPSocket udp; |
55 | | -if (!udp.PrepareUDPClientSocket() || udp.getSocket() <0){ |
56 | | -cerr << "couldn't prepare client" << endl; |
57 | | -return; |
58 | | -} |
59 | | -Datagram dg(nickname,port,server.data()); |
60 | | -udp.sendDatagram(dg); |
| 56 | +void clientcomm(int in,string server, short port, string nickname) { |
| 57 | +UDPSocket udp; |
| 58 | +if (!udp.PrepareUDPClientSocket() || udp.getSocket() <0) { |
| 59 | +cerr << "couldn't prepare client" << endl; |
| 60 | +return; |
| 61 | +} |
| 62 | +Datagram dg(nickname,port,server.data()); |
| 63 | +udp.sendDatagram(dg); |
61 | 64 |
|
62 | | - bool eofSocket=false; |
63 | | - bool eofStdin=false; |
64 | | - while(!eofSocket && !eofStdin) { |
65 | | - //TODO: hier select einfuegen inkl. vorbereitung fuer select: |
66 | | - // int res=select(...); |
67 | | - if (res < 0) { |
68 | | - cerr << "select failed:" << strerror(errno) << endl; |
69 | | - continue; |
70 | | - } |
71 | | - //TODO: if (input auf stdin (in) verfuegbar) |
72 | | - eofStdin = handleInput(in,udp,server,port); |
73 | | - // |
74 | | - //TODO: if (input auf socket verfuegbar) |
75 | | - eofSocket = handleOutput(1,udp); |
76 | | - } |
| 65 | + bool eofSocket = false; |
| 66 | + bool eofStdin = false; |
| 67 | + while (!eofSocket && !eofStdin) { |
| 68 | + |
| 69 | + long msec = 1500; // Timeout = 2500 msec |
| 70 | + fd_set rset; |
| 71 | + FD_ZERO(&rset); |
| 72 | + FD_SET(in, &rset); |
| 73 | + FD_SET(udp.getSocket(), &rset); |
| 74 | + struct timeval to; |
| 75 | + to.tv_sec = msec / 1000; |
| 76 | + to.tv_usec = (msec % 1000)*1000; |
| 77 | + int res = select(max(in, udp.getSocket()) + 1, &rset, 0, 0, &to); |
| 78 | + |
| 79 | + if (res < 0) { |
| 80 | + cerr << "select failed:" << strerror(errno) << endl; |
| 81 | + continue; |
| 82 | + } |
| 83 | + if (res == 0) { |
| 84 | + //cerr << "timeout exeeded..." << endl; |
| 85 | + continue; |
| 86 | + } |
| 87 | + |
| 88 | + if (FD_ISSET(in, &rset)) { |
| 89 | + eofStdin = handleInput(in, udp, server, port); |
| 90 | + } |
| 91 | + if (FD_ISSET(udp.getSocket(), &rset)) { |
| 92 | + eofSocket = handleOutput(1, udp); |
| 93 | + } |
| 94 | + } |
77 | 95 | } |
78 | 96 |
|
79 | | -int main(int argc,char**argv) |
80 | | -{ |
| 97 | +int main(int argc, char**argv) { |
81 | 98 | if (argc < 4) { |
82 | | - cerr << "usage: " << argv[0] << " hostip port nickname" << endl; |
83 | | -return 1; |
| 99 | + cerr << "usage: " << argv[0] << " hostip port nickname" << endl; |
| 100 | +return 1; |
84 | 101 | } |
85 | 102 | string server = argv[1]; |
86 | 103 | short port = atoi(argv[2]); |
87 | | - clientcomm(0,server,port,argv[3]); |
| 104 | + clientcomm(0,server,port,argv[3]); |
88 | 105 | return 0; |
89 | 106 | } |
0 commit comments