1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
--- ./classes/include/Ipv4Network.hh.orig Tue Sep 12 14:26:26 2000
+++ ./classes/include/Ipv4Network.hh Wed Sep 25 16:38:10 2002
@@ -20,7 +20,8 @@
}
#ifdef HAVE_IOSTREAM
- #include <iostream.h>
+ #include <iostream>
+ using namespace std;
#else
#include <iostream.h>
#endif
@@ -39,7 +40,7 @@
{
public:
ipv4addr_t net;
- uint8_t maskLen;
+ char maskLen;
//--------------------------------------------------------------------------
// Ipv4Network()
@@ -181,10 +182,10 @@
istream & read(istream & is)
{
is.read(&this->maskLen,sizeof(this->maskLen));
- uint8_t octet1 = 0;
- uint8_t octet2 = 0;
- uint8_t octet3 = 0;
- uint8_t netSize = (this->maskLen + 7) / 8;
+ char octet1 = 0;
+ char octet2 = 0;
+ char octet3 = 0;
+ char netSize = (this->maskLen + 7) / 8;
switch (netSize) {
case 1:
@@ -206,7 +207,7 @@
((ipv4addr_t)octet3 << 8));
break;
case 4:
- is.read(&this->net,sizeof(this->net));
+ is.read((char *)&this->net,sizeof(this->net));
break;
default:
break;
@@ -295,11 +296,11 @@
// first we write the netmask length
os.write(&this->maskLen,sizeof(this->maskLen));
- uint8_t octet1 = 0;
- uint8_t octet2 = 0;
- uint8_t octet3 = 0;
+ char octet1 = 0;
+ char octet2 = 0;
+ char octet3 = 0;
ipv4addr_t netaddr;
- uint8_t netSize = (this->maskLen + 7) / 8;
+ char netSize = (this->maskLen + 7) / 8;
// and then write the network prefix
switch (netSize) {
@@ -324,7 +325,7 @@
os.write(&octet3,sizeof(octet3));
break;
case 4:
- os.write(&this->net,sizeof(this->net));
+ os.write((char *)&this->net,sizeof(this->net));
break;
default:
break;
|
