projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gnutls
[umurmur.git]
/
src
/
client.h
diff --git
a/src/client.h
b/src/client.h
index 721099bbe18f682cbba2149414006f84f74af747..c6085d298e6563779f4763f60d4d6f9b0ab284dd 100644
(file)
--- a/
src/client.h
+++ b/
src/client.h
@@
-1,5
+1,5
@@
-/* Copyright (C) 2009-201
3
, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-201
3
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-201
4
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-201
4
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-31,7
+31,7
@@
#ifndef CLIENT_H_45786678
#define CLIENT_H_45786678
#ifndef CLIENT_H_45786678
#define CLIENT_H_45786678
-#include
<config.h>
+#include
"config.h"
#include <stdint.h>
#include <unistd.h> /* close() */
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h> /* close() */
#include <sys/types.h>
@@
-65,9
+65,9
@@
typedef struct {
bool_t shutdown_wait;
cryptState_t cryptState;
bool_t readBlockedOnWrite, writeBlockedOnRead;
bool_t shutdown_wait;
cryptState_t cryptState;
bool_t readBlockedOnWrite, writeBlockedOnRead;
-
+
struct sockaddr_in remote_tcp;
struct sockaddr_in remote_tcp;
- struct sockaddr_in remote_udp;
+ struct sockaddr_in remote_udp;
uint8_t rxbuf[BUFSIZE], txbuf[BUFSIZE];
uint32_t rxcount, msgsize, drainleft, txcount, txsize;
int sessionId;
uint8_t rxbuf[BUFSIZE], txbuf[BUFSIZE];
uint32_t rxcount, msgsize, drainleft, txcount, txsize;
int sessionId;
@@
-91,6
+91,7
@@
typedef struct {
int tokencount;
uint8_t hash[20];
bool_t isAdmin;
int tokencount;
uint8_t hash[20];
bool_t isAdmin;
+ bool_t isSuppressed;
float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
uint32_t UDPPackets, TCPPackets;
} client_t;
float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
uint32_t UDPPackets, TCPPackets;
} client_t;