Skip to content

Commit 999fea9

Browse files
fpagliughifpagliughi
committed
Fixed license in source files
Added a TCP client sample Fixed the 'is_connected' functionality of tcp_client. Checking the return value of all system calls and setting last_error accordingly. Changed return value to bool for methods that return binary suceed/fail (from int 0/-1).
1 parent 5a22a8c commit 999fea9

17 files changed

+2701
-221
lines changed

‎Doxyfile

+2,303
Large diffs are not rendered by default.

‎LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2016, Frank Pagliughi
3+
Copyright (c) 2016-2017, Frank Pagliughi
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without
@@ -27,3 +27,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
2727
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2828
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+

‎Makefile

+15-7
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,16 @@ ifdef SRC_IGNORE
7070
endif
7171

7272
OBJS := $(addprefix $(OBJ_DIR)/,$(SRCS:.cpp=.o))
73+
74+
# ----- Dependencies created with .dep suffix in obj dir -----
75+
7376
DEPS := $(OBJS:.o=.dep)
7477

78+
DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJ_DIR)/$*.Tdep
79+
COMPILE.cc = $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
80+
81+
POST_COMPILE = mv -f $(OBJ_DIR)/$*.Tdep $(OBJ_DIR)/$*.dep
82+
7583
# ----- Compiler flags, etc -----
7684

7785
ifneq ($(CROSS_COMPILE),)
@@ -82,6 +90,8 @@ ifneq ($(CROSS_COMPILE),)
8290
endif
8391

8492
CPPFLAGS += -Wall -fPIC
93+
94+
# We need at least C++11 support, though 14 or 17 should work fine.
8595
CXXFLAGS += -std=c++11
8696

8797
ifdef DEBUG
@@ -102,9 +112,10 @@ LDFLAGS := -g -shared -Wl,-soname,$(LIB_MAJOR_LINK) -L$(LIB_DIR)
102112

103113
# ----- Compiler directives -----
104114

105-
$(OBJ_DIR)/%.o: %.cpp
115+
$(OBJ_DIR)/%.o: %.cpp $(OBJ_DIR)/%.dep
106116
@echo $(CXX) $<
107117
$(QUIET) $(COMPILE.cpp) $(OUTPUT_OPTION) $<
118+
$(QUIET) $(POST_COMPILE)
108119

109120
# ----- Build targets -----
110121

@@ -171,14 +182,11 @@ uninstall:
171182

172183
# ----- Header dependencies -----
173184

185+
$(OBJ_DIR)/%.dep: ;
186+
.PRECIOUS: $(OBJ_DIR)/%.dep
187+
174188
MKG := $(findstring $(MAKECMDGOALS),"clean distclean dump")
175189
ifeq "$(MKG)" ""
176190
-include $(DEPS)
177191
endif
178192

179-
$(OBJ_DIR)/%.dep: %.cpp
180-
@echo DEP $<
181-
$(QUIET) $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
182-
sed 's,\($*\)\.o[ :]*,$$(OBJ_DIR)/\1.o $@ : ,g' < $@.$$$$ > $@; \
183-
$(RM) $@.$$$$
184-

‎devenv.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
#
3+
# Sets up the development environment for the sockpp library.
4+
#
5+
6+
export SOCKPP_DIR=$PWD
7+
8+
export LD_LIBRARY_PATH=${SOCKPP_DIR}/lib
9+

‎samples/mtechosvr.cpp

+42-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,44 @@
11
// mtechosvr.cpp
2-
//
3-
// A multi-threaded echo server for sockpp library.
4-
// This is a simple thread-per-connection server.
5-
//
2+
//
3+
// A multi-threaded TCP echo server for sockpp library.
4+
// This is a simple thread-per-connection TCP server.
5+
//
66
// USAGE:
7-
// mtechosvr [port]
7+
// mtechosvr [port]
8+
//
9+
// --------------------------------------------------------------------------
10+
// This file is part of the "sockpp" C++ socket library.
11+
//
12+
// Copyright (c) 2014-2017 Frank Pagliughi
13+
// All rights reserved.
14+
//
15+
// Redistribution and use in source and binary forms, with or without
16+
// modification, are permitted provided that the following conditions are
17+
// met:
818
//
19+
// 1. Redistributions of source code must retain the above copyright notice,
20+
// this list of conditions and the following disclaimer.
21+
//
22+
// 2. Redistributions in binary form must reproduce the above copyright
23+
// notice, this list of conditions and the following disclaimer in the
24+
// documentation and/or other materials provided with the distribution.
25+
//
26+
// 3. Neither the name of the copyright holder nor the names of its
27+
// contributors may be used to endorse or promote products derived from this
28+
// software without specific prior written permission.
29+
//
30+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
31+
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
32+
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
33+
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
34+
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
35+
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
36+
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
37+
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
38+
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
39+
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
40+
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41+
// --------------------------------------------------------------------------
942

1043
#include <iostream>
1144
#include <thread>
@@ -23,8 +56,12 @@ void run_echo(sockpp::tcp_socket sock)
2356
int n;
2457
char buf[512];
2558

59+
cout << "Received a new connection." << endl;
60+
2661
while ((n = sock.read(buf, sizeof(buf))) > 0)
2762
sock.write_n(buf, n);
63+
64+
cout << "Connection closed." << endl;
2865
}
2966

3067
// --------------------------------------------------------------------------

‎samples/tcpecho.cpp

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
// tcpecho.cpp
2+
//
3+
// Simple TCP echo client
4+
//
5+
// --------------------------------------------------------------------------
6+
// This file is part of the "sockpp" C++ socket library.
7+
//
8+
// Copyright (c) 2014-2017 Frank Pagliughi
9+
// All rights reserved.
10+
//
11+
// Redistribution and use in source and binary forms, with or without
12+
// modification, are permitted provided that the following conditions are
13+
// met:
14+
//
15+
// 1. Redistributions of source code must retain the above copyright notice,
16+
// this list of conditions and the following disclaimer.
17+
//
18+
// 2. Redistributions in binary form must reproduce the above copyright
19+
// notice, this list of conditions and the following disclaimer in the
20+
// documentation and/or other materials provided with the distribution.
21+
//
22+
// 3. Neither the name of the copyright holder nor the names of its
23+
// contributors may be used to endorse or promote products derived from this
24+
// software without specific prior written permission.
25+
//
26+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
27+
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
28+
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
29+
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
30+
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
31+
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
32+
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
33+
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
34+
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
35+
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
36+
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37+
// --------------------------------------------------------------------------
38+
39+
#include <iostream>
40+
#include <string>
41+
#include "sockpp/tcp_connector.h"
42+
43+
using namespace std;
44+
45+
int main(int argc, char* argv[])
46+
{
47+
string host = "localhost";
48+
in_port_t port = (argc > 1) ? atoi(argv[1]) : 12345;
49+
50+
sockpp::tcp_connector conn(sockpp::inet_address("localhost", port));
51+
if (!conn) {
52+
cerr << "Error connecting to " << host << ":" << port << endl;
53+
return 1;
54+
}
55+
56+
string s, sret;
57+
while (getline(cin, s) && !s.empty()) {
58+
if (conn.write(s) != (int) s.length()) {
59+
cerr << "Error writing to the TCP stream" << endl;
60+
break;
61+
}
62+
63+
sret.resize(s.length());
64+
int n = conn.read_n(&sret[0], s.length());
65+
66+
if (n != (int) s.length()) {
67+
cerr << "Error reading from TCP stream" << endl;
68+
break;
69+
}
70+
71+
cout << sret << endl;
72+
}
73+
74+
return (!conn) ? 1 : 0;
75+
}

‎src/exception.cpp

+35
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,39 @@
11
// exception.cpp
2+
//
3+
// ## License -----------------------------------------------------------------
4+
//
5+
// BSD 3-Clause License
6+
//
7+
// Copyright (c) 2016-2017, Frank Pagliughi
8+
// All rights reserved.
9+
//
10+
// Redistribution and use in source and binary forms, with or without
11+
// modification, are permitted provided that the following conditions are met:
12+
//
13+
// * Redistributions of source code must retain the above copyright notice, this
14+
// list of conditions and the following disclaimer.
15+
//
16+
// * Redistributions in binary form must reproduce the above copyright notice,
17+
// this list of conditions and the following disclaimer in the documentation
18+
// and/or other materials provided with the distribution.
19+
//
20+
// * Neither the name of the copyright holder nor the names of its
21+
// contributors may be used to endorse or promote products derived from
22+
// this software without specific prior written permission.
23+
//
24+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25+
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
27+
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
28+
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29+
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30+
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
31+
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
32+
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
//
35+
// ## End License -------------------------------------------------------------
36+
//
237

338
#include "sockpp/exception.h"
439
#include <errno.h>

‎src/inet_address.cpp

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
// InetAddr.cpp
1+
// inet_address.cpp
22
//
3-
43
// --------------------------------------------------------------------------
54
// This file is part of the "sockpp" C++ socket library.
65
//
7-
// Copyright (C) 2014 Frank Pagliughi
6+
// Copyright (c) 2014-2017 Frank Pagliughi
87
// All rights reserved.
9-
//
8+
//
109
// Redistribution and use in source and binary forms, with or without
1110
// modification, are permitted provided that the following conditions are
1211
// met:
13-
//
12+
//
1413
// 1. Redistributions of source code must retain the above copyright notice,
1514
// this list of conditions and the following disclaimer.
16-
//
15+
//
1716
// 2. Redistributions in binary form must reproduce the above copyright
1817
// notice, this list of conditions and the following disclaimer in the
1918
// documentation and/or other materials provided with the distribution.
20-
//
19+
//
2120
// 3. Neither the name of the copyright holder nor the names of its
2221
// contributors may be used to endorse or promote products derived from this
2322
// software without specific prior written permission.
@@ -60,16 +59,18 @@ in_addr_t inet_address::resolve_name(const std::string& saddr)
6059
{
6160
#if defined(NET_LWIP)
6261
return in_addr_t(0);
63-
#else
64-
#if !defined(WIN32)
65-
in_addr ia;
66-
if (::inet_aton(saddr.c_str(), &ia))
67-
return ia.s_addr;
68-
#endif
62+
#endif
6963

70-
hostent *host = ::gethostbyname(saddr.c_str());
71-
return (host) ? *((in_addr_t*) host->h_addr_list[0]) : 0;
64+
#if !defined(WIN32)
65+
in_addr ia;
66+
if (::inet_aton(saddr.c_str(), &ia) != 0)
67+
return ia.s_addr;
7268
#endif
69+
70+
// On error this sets h_error (not errno). Errors could be
71+
// HOST_NOT_FOUND, NO_ADDRESS, etc.
72+
hostent *host = ::gethostbyname(saddr.c_str());
73+
return (host) ? *((in_addr_t*) host->h_addr_list[0]) : in_addr_t(0);
7374
}
7475

7576
// --------------------------------------------------------------------------
@@ -86,7 +87,7 @@ void inet_address::create(uint32_t addr, in_port_t port)
8687

8788
void inet_address::create(const std::string& saddr, in_port_t port)
8889
{
89-
zero();
90+
zero();
9091
sin_family = AF_INET;
9192
sin_addr.s_addr = resolve_name(saddr.c_str());
9293
sin_port = htons(port);

0 commit comments

Comments
 (0)