Skip to content
This repository was archived by the owner on Feb 1, 2021. It is now read-only.

Commit a930043

Browse files
bump version to 0.3.0.0 (#283)
* bump version to 0.3.0.0
1 parent 37f9715 commit a930043

File tree

7 files changed

+32
-27
lines changed

7 files changed

+32
-27
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ esac
1010
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
1111
AC_PREREQ([2.60])
1212
define(_CLIENT_VERSION_MAJOR, 0)
13-
define(_CLIENT_VERSION_MINOR, 2)
14-
define(_CLIENT_VERSION_REVISION, 5)
15-
define(_CLIENT_VERSION_BUILD, 18) # version 99 here indicates an unreleased version
13+
define(_CLIENT_VERSION_MINOR, 3)
14+
define(_CLIENT_VERSION_REVISION, 0)
15+
define(_CLIENT_VERSION_BUILD, 0) # version 99 here indicates an unreleased version
1616
define(_CLIENT_VERSION_IS_RELEASE, true)
1717
define(_COPYRIGHT_YEAR, 2019)
1818
define(_COPYRIGHT_HOLDERS,[The %s developers])

contrib/gitian-descriptors/gitian-arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "eccoin-linux-0.2.5.18"
2+
name: "eccoin-linux-0.3.0.0"
33
enable_cache: true
44
suites:
55
- "bionic"

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "eccoin-linux-0.2.5.18"
2+
name: "eccoin-linux-0.3.0.0"
33
enable_cache: true
44
suites:
55
- "bionic"

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "eccoin-osx-0.2.5.18"
2+
name: "eccoin-osx-0.3.0.0"
33
enable_cache: true
44
suites:
55
- "bionic"

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "eccoin-win-0.2.5.18"
2+
name: "eccoin-win-0.3.0.0"
33
enable_cache: true
44
suites:
55
- "bionic"

src/clientversion.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
2121
#define CLIENT_VERSION_MAJOR 0
22-
#define CLIENT_VERSION_MINOR 2
23-
#define CLIENT_VERSION_REVISION 5
24-
#define CLIENT_VERSION_BUILD 18
22+
#define CLIENT_VERSION_MINOR 3
23+
#define CLIENT_VERSION_REVISION 0
24+
#define CLIENT_VERSION_BUILD 0
2525

2626
//! Set to true for release, false for prerelease or test build
2727
#define CLIENT_VERSION_IS_RELEASE true

src/net/netbase.cpp

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -208,41 +208,46 @@ struct timeval MillisToTimeval(int64_t nTimeout)
208208
}
209209

210210
/** SOCKS version */
211-
enum SOCKSVersion: uint8_t {
211+
enum SOCKSVersion : uint8_t
212+
{
212213
SOCKS4 = 0x04,
213214
SOCKS5 = 0x05
214215
};
215216

216217
/** Values defined for METHOD in RFC1928 */
217-
enum SOCKS5Method: uint8_t {
218-
NOAUTH = 0x00, //!< No authentication required
219-
GSSAPI = 0x01, //!< GSSAPI
220-
USER_PASS = 0x02, //!< Username/password
218+
enum SOCKS5Method : uint8_t
219+
{
220+
NOAUTH = 0x00, //!< No authentication required
221+
GSSAPI = 0x01, //!< GSSAPI
222+
USER_PASS = 0x02, //!< Username/password
221223
NO_ACCEPTABLE = 0xff, //!< No acceptable methods
222224
};
223225

224226
/** Values defined for CMD in RFC1928 */
225-
enum SOCKS5Command: uint8_t {
227+
enum SOCKS5Command : uint8_t
228+
{
226229
CONNECT = 0x01,
227230
BIND = 0x02,
228231
UDP_ASSOCIATE = 0x03
229232
};
230233

231234
/** Values defined for REP in RFC1928 */
232-
enum SOCKS5Reply: uint8_t {
233-
SUCCEEDED = 0x00, //!< Succeeded
234-
GENFAILURE = 0x01, //!< General failure
235-
NOTALLOWED = 0x02, //!< Connection not allowed by ruleset
236-
NETUNREACHABLE = 0x03, //!< Network unreachable
237-
HOSTUNREACHABLE = 0x04, //!< Network unreachable
238-
CONNREFUSED = 0x05, //!< Connection refused
239-
TTLEXPIRED = 0x06, //!< TTL expired
240-
CMDUNSUPPORTED = 0x07, //!< Command not supported
235+
enum SOCKS5Reply : uint8_t
236+
{
237+
SUCCEEDED = 0x00, //!< Succeeded
238+
GENFAILURE = 0x01, //!< General failure
239+
NOTALLOWED = 0x02, //!< Connection not allowed by ruleset
240+
NETUNREACHABLE = 0x03, //!< Network unreachable
241+
HOSTUNREACHABLE = 0x04, //!< Network unreachable
242+
CONNREFUSED = 0x05, //!< Connection refused
243+
TTLEXPIRED = 0x06, //!< TTL expired
244+
CMDUNSUPPORTED = 0x07, //!< Command not supported
241245
ATYPEUNSUPPORTED = 0x08, //!< Address type not supported
242246
};
243247

244248
/** Values defined for ATYPE in RFC1928 */
245-
enum SOCKS5Atyp: uint8_t {
249+
enum SOCKS5Atyp : uint8_t
250+
{
246251
IPV4 = 0x01,
247252
DOMAINNAME = 0x03,
248253
IPV6 = 0x04,
@@ -269,7 +274,7 @@ static bool InterruptibleRecv(uint8_t *data, size_t len, int timeout, SOCKET &hS
269274
while (len > 0 && curTime < endTime)
270275
{
271276
// Optimistically try the recv first
272-
ssize_t ret = recv(hSocket, (char*)data, len, 0);
277+
ssize_t ret = recv(hSocket, (char *)data, len, 0);
273278
if (ret > 0)
274279
{
275280
len -= ret;

0 commit comments

Comments
 (0)