eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

new version, some code style

Browse source
This commit is contained in:
Volker Fischer 2009-03-30 19:29:55 +00:00
parent 7f9de079b0
commit 08aaac13bf
3 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT(src/main.cpp) AC_INIT(src/main.cpp)
AM_INIT_AUTOMAKE(llcon,2.2.1) AM_INIT_AUTOMAKE(llcon,2.2.2cvs)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)

2
src/global.h
View file

@ -43,7 +43,7 @@
// version and application name (always use this version) // version and application name (always use this version)
#undef VERSION #undef VERSION
#define VERSION "2.2.1" #define VERSION "2.2.2cvs"
#define APP_NAME "llcon" #define APP_NAME "llcon"
// file name for logging file // file name for logging file

24
src/protocol.cpp
View file

@ -55,7 +55,7 @@ MESSAGES
note: does not have any data -> n = 0 note: does not have any data -> n = 0
- Network buffer block size factor PROTMESSID_NET_BLSI_FACTOR - Network buffer block size factor: PROTMESSID_NET_BLSI_FACTOR
note: size, relative to minimum block size note: size, relative to minimum block size
@ -63,14 +63,14 @@ MESSAGES
| 2 bytes factor | | 2 bytes factor |
+----------------+ +----------------+
- Gain of channel PROTMESSID_CHANNEL_GAIN - Gain of channel: PROTMESSID_CHANNEL_GAIN
+-------------------+--------------+ +-------------------+--------------+
| 1 byte channel ID | 2 bytes gain | | 1 byte channel ID | 2 bytes gain |
+-------------------+--------------+ +-------------------+--------------+
- IP number and name of connected clients PROTMESSID_CONN_CLIENTS_LIST - IP number and name of connected clients: PROTMESSID_CONN_CLIENTS_LIST
for each connected client append following data: for each connected client append following data:
@ -83,7 +83,7 @@ MESSAGES
note: does not have any data -> n = 0 note: does not have any data -> n = 0
- Name of channel PROTMESSID_CHANNEL_NAME - Name of channel: PROTMESSID_CHANNEL_NAME
for each connected client append following data: for each connected client append following data:
@ -92,13 +92,13 @@ MESSAGES
+------------------+----------------------+ +------------------+----------------------+
- Chat text PROTMESSID_CHAT_TEXT - Chat text: PROTMESSID_CHAT_TEXT
+------------------+----------------------+ +------------------+----------------------+
| 2 bytes number n | n bytes UTF-8 string | | 2 bytes number n | n bytes UTF-8 string |
+------------------+----------------------+ +------------------+----------------------+
- Ping message (for measuring the ping time) PROTMESSID_PING_MS - Ping message (for measuring the ping time): PROTMESSID_PING_MS
+-----------------------------+ +-----------------------------+
| 4 bytes transmit time in ms | | 4 bytes transmit time in ms |
@ -337,62 +337,50 @@ bool CProtocol::ParseMessage ( const CVector<uint8_t>& vecbyData,
switch ( iRecID ) switch ( iRecID )
{ {
case PROTMESSID_JITT_BUF_SIZE: case PROTMESSID_JITT_BUF_SIZE:
bRet = EvaluateJitBufMes ( vecData ); bRet = EvaluateJitBufMes ( vecData );
break; break;
case PROTMESSID_REQ_JITT_BUF_SIZE: case PROTMESSID_REQ_JITT_BUF_SIZE:
bRet = EvaluateReqJitBufMes ( vecData ); bRet = EvaluateReqJitBufMes ( vecData );
break; break;
case PROTMESSID_SERVER_FULL: case PROTMESSID_SERVER_FULL:
bRet = EvaluateServerFullMes ( vecData ); bRet = EvaluateServerFullMes ( vecData );
break; break;
case PROTMESSID_NET_BLSI_FACTOR: case PROTMESSID_NET_BLSI_FACTOR:
bRet = EvaluateNetwBlSiFactMes ( vecData ); bRet = EvaluateNetwBlSiFactMes ( vecData );
break; break;
case PROTMESSID_CHANNEL_GAIN: case PROTMESSID_CHANNEL_GAIN:
bRet = EvaluateChanGainMes ( vecData ); bRet = EvaluateChanGainMes ( vecData );
break; break;
case PROTMESSID_CONN_CLIENTS_LIST: case PROTMESSID_CONN_CLIENTS_LIST:
bRet = EvaluateConClientListMes ( vecData ); bRet = EvaluateConClientListMes ( vecData );
break; break;
case PROTMESSID_REQ_CONN_CLIENTS_LIST: case PROTMESSID_REQ_CONN_CLIENTS_LIST:
bRet = EvaluateReqConnClientsList ( vecData ); bRet = EvaluateReqConnClientsList ( vecData );
break; break;
case PROTMESSID_CHANNEL_NAME: case PROTMESSID_CHANNEL_NAME:
bRet = EvaluateChanNameMes ( vecData ); bRet = EvaluateChanNameMes ( vecData );
break; break;
case PROTMESSID_CHAT_TEXT: case PROTMESSID_CHAT_TEXT:
bRet = EvaluateChatTextMes ( vecData ); bRet = EvaluateChatTextMes ( vecData );
break; break;
case PROTMESSID_PING_MS: case PROTMESSID_PING_MS:
bRet = EvaluatePingMes ( vecData ); bRet = EvaluatePingMes ( vecData );
break; break;
case PROTMESSID_NETW_TRANSPORT_PROPS: case PROTMESSID_NETW_TRANSPORT_PROPS:
bRet = EvaluateNetwTranspPropsMes ( vecData ); bRet = EvaluateNetwTranspPropsMes ( vecData );
break; break;
case PROTMESSID_REQ_NETW_TRANSPORT_PROPS: case PROTMESSID_REQ_NETW_TRANSPORT_PROPS:
bRet = EvaluateReqNetwTranspPropsMes ( vecData ); bRet = EvaluateReqNetwTranspPropsMes ( vecData );
break; break;
} }