diff options
| author | Coren[m] <Break@Ocean> | 2013-09-12 19:55:51 +0200 |
|---|---|---|
| committer | Coren[m] <Break@Ocean> | 2013-09-12 19:55:51 +0200 |
| commit | cdd5878bc4451c7411b04e7ba4911fd5eaffcdf9 (patch) | |
| tree | 4a57e574c8676b27ed5b1e43512cd20c20da7cc4 /toxcore/network.h | |
| parent | 591d6c70c635406830486deb561343e4dc06af2a (diff) | |
| parent | b37b521cd5fa9454d34cb5d5ebdc2d378529cac2 (diff) | |
Merge remote-tracking branch 'upstream/master' into Integration
Conflicts resolved:
toxcore/Messenger.c
toxcore/network.h
Diffstat (limited to 'toxcore/network.h')
| -rw-r--r-- | toxcore/network.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/toxcore/network.h b/toxcore/network.h index 6cdf300d..12a48868 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
| @@ -78,6 +78,7 @@ typedef int sock_t; | |||
| 78 | #define NET_PACKET_DATA 18 /* Data packet ID. */ | 78 | #define NET_PACKET_DATA 18 /* Data packet ID. */ |
| 79 | #define NET_PACKET_CRYPTO 32 /* Encrypted data packet ID. */ | 79 | #define NET_PACKET_CRYPTO 32 /* Encrypted data packet ID. */ |
| 80 | #define NET_PACKET_LAN_DISCOVERY 33 /* LAN discovery packet ID. */ | 80 | #define NET_PACKET_LAN_DISCOVERY 33 /* LAN discovery packet ID. */ |
| 81 | #define NET_PACKET_GROUP_CHATS 48 /* Group chats packet ID. */ | ||
| 81 | 82 | ||
| 82 | #define TOX_PORTRANGE_FROM 33445 | 83 | #define TOX_PORTRANGE_FROM 33445 |
| 83 | #define TOX_PORTRANGE_TO 33455 | 84 | #define TOX_PORTRANGE_TO 33455 |