diff options
40 files changed, 3968 insertions, 5119 deletions
@@ -1,7 +1,7 @@ | |||
1 | #Install Instructions | 1 | #Install Instructions |
2 | 2 | ||
3 | - [Installation](#installation) | 3 | - [Installation](#installation) |
4 | - [Unix like (Linux)](#unix) | 4 | - [Unix like](#unix) |
5 | - [OS X](#osx) | 5 | - [OS X](#osx) |
6 | - [Homebrew](#homebrew) | 6 | - [Homebrew](#homebrew) |
7 | - [Non-Homebrew](#non-homebrew) | 7 | - [Non-Homebrew](#non-homebrew) |
@@ -11,7 +11,7 @@ | |||
11 | ##Installation | 11 | ##Installation |
12 | 12 | ||
13 | <a name="unix" /> | 13 | <a name="unix" /> |
14 | ###Most Unix like OSes (Linux): | 14 | ###Most Unix like OSes: |
15 | 15 | ||
16 | Build dependencies: | 16 | Build dependencies: |
17 | 17 | ||
diff --git a/build/Makefile.am b/build/Makefile.am index 9530e1a7..5514a4d5 100644 --- a/build/Makefile.am +++ b/build/Makefile.am | |||
@@ -5,8 +5,7 @@ noinst_bindir = $(top_builddir)/build | |||
5 | EXTRA_DIST= | 5 | EXTRA_DIST= |
6 | 6 | ||
7 | include ../toxcore/Makefile.inc | 7 | include ../toxcore/Makefile.inc |
8 | include ../toxrtp/Makefile.inc | 8 | include ../toxav/Makefile.inc |
9 | include ../toxmsi/Makefile.inc | ||
10 | include ../other/Makefile.inc | 9 | include ../other/Makefile.inc |
11 | include ../testing/Makefile.inc | 10 | include ../testing/Makefile.inc |
12 | include ../other/bootstrap_serverdaemon/Makefile.inc | 11 | include ../other/bootstrap_serverdaemon/Makefile.inc |
diff --git a/configure.ac b/configure.ac index 62bb91bd..afb327cb 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -333,6 +333,7 @@ AC_TYPE_UINT16_T | |||
333 | AC_TYPE_UINT32_T | 333 | AC_TYPE_UINT32_T |
334 | AC_TYPE_UINT64_T | 334 | AC_TYPE_UINT64_T |
335 | AC_TYPE_UINT8_T | 335 | AC_TYPE_UINT8_T |
336 | AC_C_BIGENDIAN | ||
336 | 337 | ||
337 | # Checks for library functions. | 338 | # Checks for library functions. |
338 | AC_FUNC_FORK | 339 | AC_FUNC_FORK |
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc new file mode 100644 index 00000000..203d8a07 --- /dev/null +++ b/toxav/Makefile.inc | |||
@@ -0,0 +1,137 @@ | |||
1 | if BUILD_AV | ||
2 | |||
3 | lib_LTLIBRARIES += libtoxrtp.la \ | ||
4 | libtoxmsi.la \ | ||
5 | libtoxmedia.la | ||
6 | |||
7 | |||
8 | # ****** RTP ****** # | ||
9 | |||
10 | libtoxrtp_la_include_HEADERS = \ | ||
11 | ../toxav/toxrtp.h | ||
12 | |||
13 | libtoxrtp_la_includedir = $(includedir)/tox | ||
14 | |||
15 | libtoxrtp_la_SOURCES = ../toxav/toxrtp.h \ | ||
16 | ../toxav/toxrtp.c | ||
17 | |||
18 | libtoxrtp_la_CFLAGS = -I../toxcore \ | ||
19 | -I../toxav \ | ||
20 | $(NACL_CFLAGS) | ||
21 | |||
22 | libtoxrtp_la_LDFLAGS = $(TOXRTP_LT_LDFLAGS) \ | ||
23 | $(NACL_LDFLAGS) \ | ||
24 | $(EXTRA_LT_LDFLAGS) | ||
25 | |||
26 | libtoxrtp_la_LIBS = libtoxcore.la \ | ||
27 | $(NACL_LIBS) | ||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | # ****** MSI ****** # | ||
34 | |||
35 | libtoxmsi_la_include_HEADERS = \ | ||
36 | ../toxav/toxmsi.h | ||
37 | |||
38 | libtoxmsi_la_includedir = $(includedir)/tox | ||
39 | |||
40 | libtoxmsi_la_SOURCES = ../toxav/toxmsi.h \ | ||
41 | ../toxav/toxmsi.c | ||
42 | |||
43 | libtoxmsi_la_CFLAGS = -I../toxcore \ | ||
44 | -I../toxav \ | ||
45 | $(NACL_CFLAGS) | ||
46 | |||
47 | libtoxmsi_la_LDFLAGS = $(TOXMSI_LT_LDFLAGS) \ | ||
48 | $(EXTRA_LT_LDFLAGS) \ | ||
49 | $(NACL_LDFLAGS) | ||
50 | |||
51 | libtoxmsi_la_LIBS = libtoxcore.la \ | ||
52 | $(NACL_LIBS) | ||
53 | |||
54 | |||
55 | |||
56 | |||
57 | |||
58 | # ****** MEDIA ****** # | ||
59 | |||
60 | libtoxmedia_la_include_HEADERS = \ | ||
61 | ../toxav/toxmedia.h | ||
62 | |||
63 | libtoxmedia_la_includedir = $(includedir)/tox | ||
64 | |||
65 | libtoxmedia_la_SOURCES = ../toxav/toxmedia.h \ | ||
66 | ../toxav/toxmedia.c | ||
67 | |||
68 | libtoxmedia_la_CFLAGS = -I../toxcore \ | ||
69 | -I../toxav \ | ||
70 | $(AVFORMAT_CFLAGS) \ | ||
71 | $(AVCODEC_CFLAGS) \ | ||
72 | $(AVUTIL_CFLAGS) \ | ||
73 | $(AVDEVICE_CFLAGS) \ | ||
74 | $(SWSCALE_CFLAGS) \ | ||
75 | $(SDL_CFLAGS) \ | ||
76 | $(OPENAL_CFLAGS) \ | ||
77 | $(NACL_CFLAGS) \ | ||
78 | $(OPUS_CFLAGS) | ||
79 | |||
80 | |||
81 | libtoxmedia_la_LDFLAGS = $(TOXMSI_LT_LDFLAGS) \ | ||
82 | $(TOXRTP_LT_LDFLAGS) \ | ||
83 | $(EXTRA_LT_LDFLAGS) \ | ||
84 | $(NACL_LDFLAGS) | ||
85 | |||
86 | |||
87 | libtoxmedia_la_LIBS = libtoxcore.la \ | ||
88 | $(NACL_LDFLAGS) \ | ||
89 | $(AVFORMAT_LIBS) \ | ||
90 | $(AVCODEC_LIBS) \ | ||
91 | $(AVUTIL_LIBS) \ | ||
92 | $(AVDEVICE_LIBS) \ | ||
93 | $(SWSCALE_LIBS) \ | ||
94 | $(SDL_LIBS) \ | ||
95 | $(OPENAL_LIBS) \ | ||
96 | $(NACL_LIBS) \ | ||
97 | $(OPUS_LIBS) | ||
98 | |||
99 | |||
100 | |||
101 | |||
102 | # ***** PHONE ***** # | ||
103 | |||
104 | noinst_PROGRAMS += phone | ||
105 | |||
106 | phone_SOURCES = ../toxav/phone.c | ||
107 | |||
108 | phone_CFLAGS = -I../toxcore \ | ||
109 | -I../toxav \ | ||
110 | $(AVFORMAT_CFLAGS) \ | ||
111 | $(AVCODEC_CFLAGS) \ | ||
112 | $(AVUTIL_CFLAGS) \ | ||
113 | $(AVDEVICE_CFLAGS) \ | ||
114 | $(SWSCALE_CFLAGS) \ | ||
115 | $(SDL_CFLAGS) \ | ||
116 | $(OPENAL_CFLAGS) \ | ||
117 | $(NACL_CFLAGS) \ | ||
118 | $(OPUS_CFLAGS) | ||
119 | |||
120 | |||
121 | phone_LDADD = libtoxrtp.la \ | ||
122 | libtoxmsi.la \ | ||
123 | libtoxmedia.la \ | ||
124 | libtoxcore.la \ | ||
125 | $(NACL_LDFLAGS) \ | ||
126 | $(AVFORMAT_LIBS) \ | ||
127 | $(AVCODEC_LIBS) \ | ||
128 | $(AVUTIL_LIBS) \ | ||
129 | $(AVDEVICE_LIBS) \ | ||
130 | $(SWSCALE_LIBS) \ | ||
131 | $(SDL_LIBS) \ | ||
132 | $(OPENAL_LIBS) \ | ||
133 | $(NACL_LIBS) \ | ||
134 | $(OPUS_LIBS) | ||
135 | |||
136 | |||
137 | endif \ No newline at end of file | ||
diff --git a/toxav/phone.c b/toxav/phone.c new file mode 100755 index 00000000..6d4b5e6b --- /dev/null +++ b/toxav/phone.c | |||
@@ -0,0 +1,735 @@ | |||
1 | /** phone.c | ||
2 | * | ||
3 | * NOTE NOTE NOTE NOTE NOTE NOTE | ||
4 | * | ||
5 | * This file is for testing/reference purposes only, hence | ||
6 | * it is _poorly_ designed and it does not fully reflect the | ||
7 | * quaility of msi nor rtp. Although toxmsi* and toxrtp* are tested | ||
8 | * there is always possiblity of crashes. If crash occures, | ||
9 | * contact me ( mannol ) on either irc channel #tox-dev @ freenode.net:6667 | ||
10 | * or eniz_vukovic@hotmail.com | ||
11 | * | ||
12 | * NOTE NOTE NOTE NOTE NOTE NOTE | ||
13 | * | ||
14 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
15 | * | ||
16 | * This file is part of Tox. | ||
17 | * | ||
18 | * Tox is free software: you can redistribute it and/or modify | ||
19 | * it under the terms of the GNU General Public License as published by | ||
20 | * the Free Software Foundation, either version 3 of the License, or | ||
21 | * (at your option) any later version. | ||
22 | * | ||
23 | * Tox is distributed in the hope that it will be useful, | ||
24 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
26 | * GNU General Public License for more details. | ||
27 | * | ||
28 | * You should have received a copy of the GNU General Public License | ||
29 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
30 | * | ||
31 | */ | ||
32 | |||
33 | #ifdef HAVE_CONFIG_H | ||
34 | #include "config.h" | ||
35 | #endif /* HAVE_CONFIG_H */ | ||
36 | |||
37 | #define _BSD_SOURCE | ||
38 | |||
39 | #include <stdio.h> | ||
40 | #include <string.h> | ||
41 | #include <stdlib.h> | ||
42 | |||
43 | #include "toxmsi.h" | ||
44 | #include "toxrtp.h" | ||
45 | #include <stdarg.h> | ||
46 | #include <unistd.h> | ||
47 | #include <assert.h> | ||
48 | |||
49 | #include "../toxcore/network.h" | ||
50 | #include "../toxcore/event.h" | ||
51 | #include "../toxcore/tox.h" | ||
52 | |||
53 | /* Define client version */ | ||
54 | #define _USERAGENT "v.0.3.0" | ||
55 | |||
56 | |||
57 | typedef struct av_friend_s { | ||
58 | int _id; | ||
59 | int _active; /* 0=false; 1=true; */ | ||
60 | } av_friend_t; | ||
61 | |||
62 | typedef struct av_session_s { | ||
63 | MSISession* _msi; | ||
64 | |||
65 | RTPSession* _rtp_audio; | ||
66 | RTPSession* _rtp_video; | ||
67 | |||
68 | pthread_mutex_t _mutex; | ||
69 | |||
70 | Tox* _messenger; | ||
71 | av_friend_t* _friends; | ||
72 | int _friend_cout; | ||
73 | uint8_t _my_public_id[200]; | ||
74 | } av_session_t; | ||
75 | |||
76 | |||
77 | void av_allocate_friend(av_session_t* _phone, int _id, int _active) | ||
78 | { | ||
79 | static int _new_id = 0; | ||
80 | |||
81 | if ( !_phone->_friends ) { | ||
82 | _phone->_friends = calloc(sizeof(av_friend_t), 1); | ||
83 | _phone->_friend_cout = 1; | ||
84 | } else{ | ||
85 | _phone->_friend_cout ++; | ||
86 | _phone->_friends = realloc(_phone->_friends, sizeof(av_friend_t) * _phone->_friend_cout); | ||
87 | } | ||
88 | |||
89 | if ( _id = -1 ) { | ||
90 | _phone->_friends->_id = _new_id; | ||
91 | _new_id ++; | ||
92 | } else _phone->_friends->_id = _id; | ||
93 | |||
94 | _phone->_friends->_active = _active; | ||
95 | } | ||
96 | av_friend_t* av_get_friend(av_session_t* _phone, int _id) | ||
97 | { | ||
98 | av_friend_t* _friends = _phone->_friends; | ||
99 | |||
100 | if ( !_friends ) return NULL; | ||
101 | |||
102 | int _it = 0; | ||
103 | for (; _it < _phone->_friend_cout; _it ++) | ||
104 | if ( _friends[_it]._id == _id ) | ||
105 | return _friends + _it; | ||
106 | |||
107 | return NULL; | ||
108 | } | ||
109 | |||
110 | |||
111 | /***************** MISC *****************/ | ||
112 | |||
113 | void INFO (const char* _format, ...) | ||
114 | { | ||
115 | printf("\r[!] "); | ||
116 | va_list _arg; | ||
117 | va_start (_arg, _format); | ||
118 | vfprintf (stdout, _format, _arg); | ||
119 | va_end (_arg); | ||
120 | printf("\n\r >> "); | ||
121 | fflush(stdout); | ||
122 | } | ||
123 | |||
124 | unsigned char *hex_string_to_bin(char hex_string[]) | ||
125 | { | ||
126 | size_t i, len = strlen(hex_string); | ||
127 | unsigned char *val = calloc(sizeof(char), len); | ||
128 | char *pos = hex_string; | ||
129 | |||
130 | for (i = 0; i < len; ++i, pos += 2) | ||
131 | sscanf(pos, "%2hhx", &val[i]); | ||
132 | |||
133 | return val; | ||
134 | } | ||
135 | |||
136 | int getinput( char* _buff, size_t _limit, int* _len ) | ||
137 | { | ||
138 | if ( fgets(_buff, _limit, stdin) == NULL ) | ||
139 | return -1; | ||
140 | |||
141 | *_len = strlen(_buff) - 1; | ||
142 | |||
143 | /* Get rid of newline */ | ||
144 | _buff[*_len] = '\0'; | ||
145 | |||
146 | return 0; | ||
147 | } | ||
148 | |||
149 | char* trim_spaces ( char* buff ) | ||
150 | { | ||
151 | |||
152 | int _i = 0, _len = strlen(buff); | ||
153 | |||
154 | char* container = calloc(sizeof(char), _len); | ||
155 | int _ci = 0; | ||
156 | |||
157 | for ( ; _i < _len; _i++ ) { | ||
158 | while ( _i < _len && buff[_i] == ' ' ) | ||
159 | _i++; | ||
160 | |||
161 | if ( _i < _len ){ | ||
162 | container[_ci] = buff[_i]; | ||
163 | _ci ++; | ||
164 | } | ||
165 | } | ||
166 | |||
167 | memcpy( buff, container, _ci ); | ||
168 | buff[_ci] = '\0'; | ||
169 | free(container); | ||
170 | return buff; | ||
171 | } | ||
172 | |||
173 | #define FRADDR_TOSTR_CHUNK_LEN 8 | ||
174 | |||
175 | static void fraddr_to_str(uint8_t *id_bin, char *id_str) | ||
176 | { | ||
177 | uint i, delta = 0, pos_extra, sum_extra = 0; | ||
178 | |||
179 | for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; i++) { | ||
180 | sprintf(&id_str[2 * i + delta], "%02hhX", id_bin[i]); | ||
181 | |||
182 | if ((i + 1) == TOX_CLIENT_ID_SIZE) | ||
183 | pos_extra = 2 * (i + 1) + delta; | ||
184 | |||
185 | if (i >= TOX_CLIENT_ID_SIZE) | ||
186 | sum_extra |= id_bin[i]; | ||
187 | |||
188 | if (!((i + 1) % FRADDR_TOSTR_CHUNK_LEN)) { | ||
189 | id_str[2 * (i + 1) + delta] = ' '; | ||
190 | delta++; | ||
191 | } | ||
192 | } | ||
193 | |||
194 | id_str[2 * i + delta] = 0; | ||
195 | |||
196 | if (!sum_extra) | ||
197 | id_str[pos_extra] = 0; | ||
198 | } | ||
199 | |||
200 | void* phone_handle_media_transport_poll ( void* _hmtc_args_p ) | ||
201 | { | ||
202 | RTPMessage* _audio_msg, * _video_msg; | ||
203 | av_session_t* _phone = _hmtc_args_p; | ||
204 | MSISession* _session = _phone->_msi; | ||
205 | |||
206 | RTPSession* _rtp_audio = _phone->_rtp_audio; | ||
207 | RTPSession* _rtp_video = _phone->_rtp_video; | ||
208 | |||
209 | |||
210 | Tox* _messenger = _phone->_messenger; | ||
211 | |||
212 | |||
213 | while ( _session->call ) { | ||
214 | |||
215 | _audio_msg = rtp_recv_msg ( _rtp_audio ); | ||
216 | _video_msg = rtp_recv_msg ( _rtp_video ); | ||
217 | |||
218 | if ( _audio_msg ) { | ||
219 | /* Do whatever with msg | ||
220 | printf("%d - %s\n", _audio_msg->header->sequnum, _audio_msg->data);*/ | ||
221 | rtp_free_msg ( _rtp_audio, _audio_msg ); | ||
222 | } | ||
223 | |||
224 | if ( _video_msg ) { | ||
225 | /* Do whatever with msg | ||
226 | p rintf("%d - %s\n", _video_msg->header->sequnum, _video_msg->data);*/ | ||
227 | rtp_free_msg ( _rtp_video, _video_msg ); | ||
228 | } | ||
229 | |||
230 | /* | ||
231 | * Send test message to the 'remote' | ||
232 | */ | ||
233 | rtp_send_msg ( _rtp_audio, _messenger, (const uint8_t*)"audio\0", 6 ); | ||
234 | |||
235 | if ( _session->call->type_local == type_video ){ /* if local call send video */ | ||
236 | rtp_send_msg ( _rtp_video, _messenger, (const uint8_t*)"video\0", 6 ); | ||
237 | } | ||
238 | |||
239 | _audio_msg = _video_msg = NULL; | ||
240 | |||
241 | |||
242 | /* Send ~1k messages per second | ||
243 | * That _should_ be enough for both Audio and Video | ||
244 | */ | ||
245 | usleep ( 1000 ); | ||
246 | /* -------------------- */ | ||
247 | } | ||
248 | |||
249 | if ( _audio_msg ) rtp_free_msg(_rtp_audio, _audio_msg); | ||
250 | rtp_release_session_recv(_rtp_audio); | ||
251 | rtp_terminate_session(_rtp_audio, _messenger); | ||
252 | |||
253 | if ( _video_msg ) rtp_free_msg(_rtp_video, _video_msg); | ||
254 | rtp_release_session_recv(_rtp_video); | ||
255 | rtp_terminate_session(_rtp_video, _messenger); | ||
256 | |||
257 | INFO("Media thread finished!"); | ||
258 | |||
259 | pthread_exit ( NULL ); | ||
260 | } | ||
261 | |||
262 | int phone_startmedia_loop ( av_session_t* _phone ) | ||
263 | { | ||
264 | if ( !_phone ){ | ||
265 | return -1; | ||
266 | } | ||
267 | |||
268 | _phone->_rtp_audio = rtp_init_session ( | ||
269 | type_audio, | ||
270 | _phone->_messenger, | ||
271 | _phone->_msi->call->peers[0], | ||
272 | _phone->_msi->call->key_peer, | ||
273 | _phone->_msi->call->key_local, | ||
274 | _phone->_msi->call->nonce_peer, | ||
275 | _phone->_msi->call->nonce_local | ||
276 | ); | ||
277 | |||
278 | _phone->_rtp_audio = rtp_init_session ( | ||
279 | type_video, | ||
280 | _phone->_messenger, | ||
281 | _phone->_msi->call->peers[0], | ||
282 | _phone->_msi->call->key_peer, | ||
283 | _phone->_msi->call->key_local, | ||
284 | _phone->_msi->call->nonce_peer, | ||
285 | _phone->_msi->call->nonce_local | ||
286 | ); | ||
287 | |||
288 | |||
289 | if ( 0 > event.rise(phone_handle_media_transport_poll, _phone) ) | ||
290 | { | ||
291 | printf("Error while starting phone_handle_media_transport_poll()\n"); | ||
292 | return -1; | ||
293 | } | ||
294 | else return 0; | ||
295 | } | ||
296 | |||
297 | |||
298 | /* Some example callbacks */ | ||
299 | |||
300 | void* callback_recv_invite ( void* _arg ) | ||
301 | { | ||
302 | const char* _call_type; | ||
303 | |||
304 | MSISession* _msi = _arg; | ||
305 | |||
306 | switch ( _msi->call->type_peer[_msi->call->peer_count - 1] ){ | ||
307 | case type_audio: | ||
308 | _call_type = "audio"; | ||
309 | break; | ||
310 | case type_video: | ||
311 | _call_type = "video"; | ||
312 | break; | ||
313 | } | ||
314 | |||
315 | INFO( "Incoming %s call!", _call_type ); | ||
316 | |||
317 | } | ||
318 | void* callback_recv_ringing ( void* _arg ) | ||
319 | { | ||
320 | INFO ( "Ringing!" ); | ||
321 | } | ||
322 | void* callback_recv_starting ( void* _arg ) | ||
323 | { | ||
324 | MSISession* _session = _arg; | ||
325 | if ( 0 != phone_startmedia_loop(_session->agent_handler) ){ | ||
326 | INFO("Starting call failed!"); | ||
327 | } else { | ||
328 | INFO ("Call started! ( press h to hangup )"); | ||
329 | } | ||
330 | } | ||
331 | void* callback_recv_ending ( void* _arg ) | ||
332 | { | ||
333 | INFO ( "Call ended!" ); | ||
334 | } | ||
335 | |||
336 | void* callback_recv_error ( void* _arg ) | ||
337 | { | ||
338 | MSISession* _session = _arg; | ||
339 | |||
340 | INFO( "Error: %s", _session->last_error_str ); | ||
341 | } | ||
342 | |||
343 | void* callback_call_started ( void* _arg ) | ||
344 | { | ||
345 | MSISession* _session = _arg; | ||
346 | if ( 0 != phone_startmedia_loop(_session->agent_handler) ){ | ||
347 | INFO("Starting call failed!"); | ||
348 | } else { | ||
349 | INFO ("Call started! ( press h to hangup )"); | ||
350 | } | ||
351 | |||
352 | } | ||
353 | void* callback_call_canceled ( void* _arg ) | ||
354 | { | ||
355 | INFO ( "Call canceled!" ); | ||
356 | } | ||
357 | void* callback_call_rejected ( void* _arg ) | ||
358 | { | ||
359 | INFO ( "Call rejected!" ); | ||
360 | } | ||
361 | void* callback_call_ended ( void* _arg ) | ||
362 | { | ||
363 | INFO ( "Call ended!" ); | ||
364 | } | ||
365 | |||
366 | void* callback_requ_timeout ( void* _arg ) | ||
367 | { | ||
368 | INFO( "No answer! " ); | ||
369 | } | ||
370 | |||
371 | int av_connect_to_dht(av_session_t* _phone, char* _dht_key, const char* _dht_addr, unsigned short _dht_port) | ||
372 | { | ||
373 | unsigned char *_binary_string = hex_string_to_bin(_dht_key); | ||
374 | |||
375 | uint16_t _port = htons(_dht_port); | ||
376 | |||
377 | int _if = tox_bootstrap_from_address(_phone->_messenger, _dht_addr, 1, _port, _binary_string ); | ||
378 | |||
379 | free(_binary_string); | ||
380 | |||
381 | return _if ? 0 : -1; | ||
382 | } | ||
383 | |||
384 | av_session_t* av_init_session() | ||
385 | { | ||
386 | av_session_t* _retu = malloc(sizeof(av_session_t)); | ||
387 | |||
388 | /* Initialize our mutex */ | ||
389 | pthread_mutex_init ( &_retu->_mutex, NULL ); | ||
390 | |||
391 | _retu->_messenger = tox_new(1); | ||
392 | |||
393 | if ( !_retu->_messenger ) { | ||
394 | fprintf ( stderr, "tox_new() failed!\n" ); | ||
395 | return NULL; | ||
396 | } | ||
397 | |||
398 | _retu->_friends = NULL; | ||
399 | |||
400 | _retu->_rtp_audio = NULL; | ||
401 | _retu->_rtp_video = NULL; | ||
402 | |||
403 | uint8_t _byte_address[TOX_FRIEND_ADDRESS_SIZE]; | ||
404 | tox_get_address(_retu->_messenger, _byte_address ); | ||
405 | fraddr_to_str( _byte_address, _retu->_my_public_id ); | ||
406 | |||
407 | |||
408 | /* Initialize msi */ | ||
409 | _retu->_msi = msi_init_session ( _retu->_messenger, _USERAGENT ); | ||
410 | |||
411 | if ( !_retu->_msi ) { | ||
412 | fprintf ( stderr, "msi_init_session() failed\n" ); | ||
413 | return NULL; | ||
414 | } | ||
415 | |||
416 | _retu->_msi->agent_handler = _retu; | ||
417 | |||
418 | /* ------------------ */ | ||
419 | msi_register_callback(callback_call_started, cb_onstart); | ||
420 | msi_register_callback(callback_call_canceled, cb_oncancel); | ||
421 | msi_register_callback(callback_call_rejected, cb_onreject); | ||
422 | msi_register_callback(callback_call_ended, cb_onend); | ||
423 | msi_register_callback(callback_recv_invite, cb_oninvite); | ||
424 | |||
425 | msi_register_callback(callback_recv_ringing, cb_ringing); | ||
426 | msi_register_callback(callback_recv_starting, cb_starting); | ||
427 | msi_register_callback(callback_recv_ending, cb_ending); | ||
428 | |||
429 | msi_register_callback(callback_recv_error, cb_error); | ||
430 | msi_register_callback(callback_requ_timeout, cb_timeout); | ||
431 | /* ------------------ */ | ||
432 | |||
433 | return _retu; | ||
434 | } | ||
435 | |||
436 | int av_terminate_session(av_session_t* _phone) | ||
437 | { | ||
438 | if ( _phone->_msi->call ){ | ||
439 | msi_hangup(_phone->_msi); /* Hangup the phone first */ | ||
440 | } | ||
441 | |||
442 | free(_phone->_friends); | ||
443 | msi_terminate_session(_phone->_msi); | ||
444 | pthread_mutex_destroy ( &_phone->_mutex ); | ||
445 | |||
446 | Tox* _p = _phone->_messenger; | ||
447 | _phone->_messenger = NULL; usleep(100000); /* Wait for tox_pool to end */ | ||
448 | tox_kill(_p); | ||
449 | |||
450 | printf("\r[i] Quit!\n"); | ||
451 | return 0; | ||
452 | } | ||
453 | |||
454 | /****** AV HELPER FUNCTIONS ******/ | ||
455 | |||
456 | /* Auto accept friend request */ | ||
457 | void av_friend_requ(uint8_t *_public_key, uint8_t *_data, uint16_t _length, void *_userdata) | ||
458 | { | ||
459 | av_session_t* _phone = _userdata; | ||
460 | av_allocate_friend (_phone, -1, 0); | ||
461 | |||
462 | INFO("Got friend request with message: %s", _data); | ||
463 | |||
464 | tox_add_friend_norequest(_phone->_messenger, _public_key); | ||
465 | |||
466 | INFO("Auto-accepted! Friend id: %d", _phone->_friends->_id ); | ||
467 | } | ||
468 | |||
469 | void av_friend_active(Tox *_messenger, int _friendnumber, uint8_t *_string, uint16_t _length, void *_userdata) | ||
470 | { | ||
471 | av_session_t* _phone = _userdata; | ||
472 | INFO("Friend no. %d is online", _friendnumber); | ||
473 | |||
474 | av_friend_t* _this_friend = av_get_friend(_phone, _friendnumber); | ||
475 | |||
476 | if ( !_this_friend ) { | ||
477 | INFO("But it's not registered!"); | ||
478 | return; | ||
479 | } | ||
480 | |||
481 | (*_this_friend)._active = 1; | ||
482 | } | ||
483 | |||
484 | int av_add_friend(av_session_t* _phone, char* _friend_hash) | ||
485 | { | ||
486 | trim_spaces(_friend_hash); | ||
487 | |||
488 | unsigned char *_bin_string = hex_string_to_bin(_friend_hash); | ||
489 | int _number = tox_add_friend(_phone->_messenger, _bin_string, (uint8_t *)"Tox phone "_USERAGENT, sizeof("Tox phone "_USERAGENT)); | ||
490 | free(_bin_string); | ||
491 | |||
492 | if ( _number >= 0) { | ||
493 | INFO("Added friend as %d", _number ); | ||
494 | av_allocate_friend(_phone, _number, 0); | ||
495 | } | ||
496 | else | ||
497 | INFO("Unknown error %i", _number ); | ||
498 | |||
499 | return _number; | ||
500 | } | ||
501 | /*********************************/ | ||
502 | |||
503 | void do_phone ( av_session_t* _phone ) | ||
504 | { | ||
505 | INFO("Welcome to tox_phone version: " _USERAGENT "\n" | ||
506 | "Usage: \n" | ||
507 | "f [pubkey] (add friend)\n" | ||
508 | "c [a/v] (type) [friend] (friend id) (calls friend if online)\n" | ||
509 | "h (if call is active hang up)\n" | ||
510 | "a [a/v] (answer incoming call: a - audio / v - audio + video (audio is default))\n" | ||
511 | "r (reject incoming call)\n" | ||
512 | "q (quit)\n" | ||
513 | "================================================================================" | ||
514 | ); | ||
515 | |||
516 | while ( 1 ) | ||
517 | { | ||
518 | char _line [ 1500 ]; | ||
519 | int _len; | ||
520 | |||
521 | if ( -1 == getinput(_line, 1500, &_len) ){ | ||
522 | printf(" >> "); | ||
523 | fflush(stdout); | ||
524 | continue; | ||
525 | } | ||
526 | |||
527 | if ( _len > 1 && _line[1] != ' ' && _line[1] != '\n' ){ | ||
528 | INFO("Invalid input!"); | ||
529 | continue; | ||
530 | } | ||
531 | |||
532 | switch (_line[0]){ | ||
533 | |||
534 | case 'f': | ||
535 | { | ||
536 | char _id [128]; | ||
537 | strncpy(_id, _line + 2, 128); | ||
538 | |||
539 | av_add_friend(_phone, _id); | ||
540 | |||
541 | } break; | ||
542 | case 'c': | ||
543 | { | ||
544 | if ( _phone->_msi->call ){ | ||
545 | INFO("Already in a call"); | ||
546 | break; | ||
547 | } | ||
548 | |||
549 | MSICallType _ctype; | ||
550 | |||
551 | if ( _len < 5 ){ | ||
552 | INFO("Invalid input; usage: c a/v [friend]"); | ||
553 | break; | ||
554 | } | ||
555 | else if ( _line[2] == 'a' || _line[2] != 'v' ){ /* default and audio */ | ||
556 | _ctype = type_audio; | ||
557 | } | ||
558 | else { /* video */ | ||
559 | _ctype = type_video; | ||
560 | } | ||
561 | |||
562 | char* _end; | ||
563 | int _friend = strtol(_line + 4, &_end, 10); | ||
564 | |||
565 | if ( *_end ){ | ||
566 | INFO("Friend num has to be numerical value"); | ||
567 | break; | ||
568 | } | ||
569 | |||
570 | /* Set timeout */ | ||
571 | msi_invite ( _phone->_msi, _ctype, 10 * 1000, _friend ); | ||
572 | INFO("Calling friend: %d!", _friend); | ||
573 | |||
574 | } break; | ||
575 | case 'h': | ||
576 | { | ||
577 | if ( !_phone->_msi->call ){ | ||
578 | INFO("No call!"); | ||
579 | break; | ||
580 | } | ||
581 | |||
582 | msi_hangup(_phone->_msi); | ||
583 | |||
584 | INFO("Hung up..."); | ||
585 | |||
586 | } break; | ||
587 | case 'a': | ||
588 | { | ||
589 | |||
590 | if ( _phone->_msi->call && _phone->_msi->call->state != call_starting ) { | ||
591 | break; | ||
592 | } | ||
593 | |||
594 | if ( _len > 1 && _line[2] == 'v' ) | ||
595 | msi_answer(_phone->_msi, type_video); | ||
596 | else | ||
597 | msi_answer(_phone->_msi, type_audio); | ||
598 | |||
599 | } break; | ||
600 | case 'r': | ||
601 | { | ||
602 | if ( _phone->_msi->call && _phone->_msi->call->state != call_starting ){ | ||
603 | break; | ||
604 | } | ||
605 | |||
606 | msi_reject(_phone->_msi); | ||
607 | |||
608 | INFO("Call Rejected..."); | ||
609 | |||
610 | } break; | ||
611 | case 'q': | ||
612 | { | ||
613 | INFO("Quitting!"); | ||
614 | return; | ||
615 | } | ||
616 | default: | ||
617 | { | ||
618 | INFO("Invalid command!"); | ||
619 | } break; | ||
620 | |||
621 | } | ||
622 | |||
623 | } | ||
624 | } | ||
625 | |||
626 | void* tox_poll (void* _messenger_p) | ||
627 | { | ||
628 | Tox** _messenger = _messenger_p; | ||
629 | while( *_messenger ) { | ||
630 | tox_do(*_messenger); | ||
631 | usleep(10000); | ||
632 | } | ||
633 | |||
634 | pthread_exit(NULL); | ||
635 | } | ||
636 | |||
637 | int av_wait_dht(av_session_t* _phone, int _wait_seconds, const char* _ip, char* _key, unsigned short _port) | ||
638 | { | ||
639 | if ( !_wait_seconds ) | ||
640 | return -1; | ||
641 | |||
642 | int _waited = 0; | ||
643 | |||
644 | while( !tox_isconnected(_phone->_messenger) ) { | ||
645 | |||
646 | if ( -1 == av_connect_to_dht(_phone, _key, _ip, _port) ) | ||
647 | { | ||
648 | INFO("Could not connect to: %s", _ip); | ||
649 | av_terminate_session(_phone); | ||
650 | return -1; | ||
651 | } | ||
652 | |||
653 | if ( _waited >= _wait_seconds ) return 0; | ||
654 | |||
655 | printf("."); | ||
656 | fflush(stdout); | ||
657 | |||
658 | _waited ++; | ||
659 | usleep(1000000); | ||
660 | } | ||
661 | |||
662 | int _r = _wait_seconds - _waited; | ||
663 | return _r ? _r : 1; | ||
664 | } | ||
665 | /* ---------------------- */ | ||
666 | |||
667 | int print_help ( const char* _name ) | ||
668 | { | ||
669 | printf ( "Usage: %s [IP] [PORT] [KEY]\n" | ||
670 | "\t[IP] (DHT ip)\n" | ||
671 | "\t[PORT] (DHT port)\n" | ||
672 | "\t[KEY] (DHT public key)\n" | ||
673 | ,_name ); | ||
674 | return 1; | ||
675 | } | ||
676 | |||
677 | int main ( int argc, char* argv [] ) | ||
678 | { | ||
679 | if ( argc < 1 || argc < 4 ) | ||
680 | return print_help(argv[0]); | ||
681 | |||
682 | char* _convertable; | ||
683 | |||
684 | int _wait_seconds = 5; | ||
685 | |||
686 | const char* _ip = argv[1]; | ||
687 | char* _key = argv[3]; | ||
688 | unsigned short _port = strtol(argv[2], &_convertable, 10); | ||
689 | |||
690 | if ( *_convertable ){ | ||
691 | printf("Invalid port: cannot convert string to long: %s", _convertable); | ||
692 | return 1; | ||
693 | } | ||
694 | |||
695 | av_session_t* _phone = av_init_session(); | ||
696 | |||
697 | tox_callback_friend_request(_phone->_messenger, av_friend_requ, _phone); | ||
698 | tox_callback_status_message(_phone->_messenger, av_friend_active, _phone); | ||
699 | |||
700 | system("clear"); | ||
701 | |||
702 | INFO("\r================================================================================\n" | ||
703 | "[!] Trying dht@%s:%d" | ||
704 | , _ip, _port); | ||
705 | |||
706 | /* Start tox protocol */ | ||
707 | event.rise( tox_poll, &_phone->_messenger ); | ||
708 | |||
709 | /* Just clean one line */ | ||
710 | printf("\r \r"); | ||
711 | fflush(stdout); | ||
712 | |||
713 | int _r; | ||
714 | for ( _r = 0; _r == 0; _r = av_wait_dht(_phone, _wait_seconds, _ip, _key, _port) ) _wait_seconds --; | ||
715 | |||
716 | |||
717 | if ( -1 == _r ) { | ||
718 | INFO("Error while connecting to dht: %s:%d", _ip, _port); | ||
719 | av_terminate_session(_phone); | ||
720 | return 1; | ||
721 | } | ||
722 | |||
723 | INFO("CONNECTED!\n" | ||
724 | "================================================================================\n" | ||
725 | "%s\n" | ||
726 | "================================================================================" | ||
727 | , _phone->_my_public_id ); | ||
728 | |||
729 | |||
730 | do_phone (_phone); | ||
731 | |||
732 | av_terminate_session(_phone); | ||
733 | |||
734 | return 0; | ||
735 | } | ||
diff --git a/toxmsi/toxmedia.c b/toxav/toxmedia.c index 4c9f5261..aff3cf8c 100644 --- a/toxmsi/toxmedia.c +++ b/toxav/toxmedia.c | |||
@@ -42,10 +42,7 @@ | |||
42 | #include <opus/opus.h> | 42 | #include <opus/opus.h> |
43 | 43 | ||
44 | #include "toxmsi.h" | 44 | #include "toxmsi.h" |
45 | #include "toxmsi_message.h" | 45 | #include "toxrtp.h" |
46 | #include "../toxrtp/toxrtp_message.h" | ||
47 | #include "../toxrtp/tests/test_helper.h" | ||
48 | #include "phone.h" | ||
49 | #include "toxmedia.h" | 46 | #include "toxmedia.h" |
50 | 47 | ||
51 | SDL_Surface *screen; | 48 | SDL_Surface *screen; |
@@ -77,7 +74,7 @@ int display_received_frame(codec_state *cs, AVFrame *r_video_frame) | |||
77 | } | 74 | } |
78 | 75 | ||
79 | struct jitter_buffer { | 76 | struct jitter_buffer { |
80 | rtp_msg_t **queue; | 77 | RTPMessage **queue; |
81 | uint16_t capacity; | 78 | uint16_t capacity; |
82 | uint16_t size; | 79 | uint16_t size; |
83 | uint16_t front; | 80 | uint16_t front; |
@@ -92,7 +89,7 @@ struct jitter_buffer *create_queue(int capacity) | |||
92 | { | 89 | { |
93 | struct jitter_buffer *q; | 90 | struct jitter_buffer *q; |
94 | q = (struct jitter_buffer *)calloc(sizeof(struct jitter_buffer),1); | 91 | q = (struct jitter_buffer *)calloc(sizeof(struct jitter_buffer),1); |
95 | q->queue = (rtp_msg_t **)calloc((sizeof(rtp_msg_t) * capacity),1); | 92 | q->queue = (RTPMessage **)calloc((sizeof(RTPMessage) * capacity),1); |
96 | int i = 0; | 93 | int i = 0; |
97 | 94 | ||
98 | for (i = 0; i < capacity; ++i) { | 95 | for (i = 0; i < capacity; ++i) { |
@@ -114,11 +111,15 @@ struct jitter_buffer *create_queue(int capacity) | |||
114 | uint8_t sequence_number_older(uint16_t sn_a, uint16_t sn_b, uint32_t ts_a, uint32_t ts_b) | 111 | uint8_t sequence_number_older(uint16_t sn_a, uint16_t sn_b, uint32_t ts_a, uint32_t ts_b) |
115 | { | 112 | { |
116 | /* should be stable enough */ | 113 | /* should be stable enough */ |
114 | |||
115 | /* TODO: There is already this kind of function in toxrtp.c. | ||
116 | * Maybe merge? | ||
117 | */ | ||
117 | return (sn_a > sn_b || ts_a > ts_b); | 118 | return (sn_a > sn_b || ts_a > ts_b); |
118 | } | 119 | } |
119 | 120 | ||
120 | /* success is 0 when there is nothing to dequeue, 1 when there's a good packet, 2 when there's a lost packet */ | 121 | /* success is 0 when there is nothing to dequeue, 1 when there's a good packet, 2 when there's a lost packet */ |
121 | rtp_msg_t *dequeue(struct jitter_buffer *q, int *success) | 122 | RTPMessage *dequeue(struct jitter_buffer *q, int *success) |
122 | { | 123 | { |
123 | if (q->size == 0 || q->queue_ready == 0) { | 124 | if (q->size == 0 || q->queue_ready == 0) { |
124 | q->queue_ready = 0; | 125 | q->queue_ready = 0; |
@@ -129,21 +130,21 @@ rtp_msg_t *dequeue(struct jitter_buffer *q, int *success) | |||
129 | int front = q->front; | 130 | int front = q->front; |
130 | 131 | ||
131 | if (q->id_set == 0) { | 132 | if (q->id_set == 0) { |
132 | q->current_id = q->queue[front]->_header->_sequence_number; | 133 | q->current_id = q->queue[front]->header->sequnum; |
133 | q->current_ts = q->queue[front]->_header->_timestamp; | 134 | q->current_ts = q->queue[front]->header->timestamp; |
134 | q->id_set = 1; | 135 | q->id_set = 1; |
135 | } else { | 136 | } else { |
136 | int next_id = q->queue[front]->_header->_sequence_number; | 137 | int next_id = q->queue[front]->header->sequnum; |
137 | int next_ts = q->queue[front]->_header->_timestamp; | 138 | int next_ts = q->queue[front]->header->timestamp; |
138 | 139 | ||
139 | /* if this packet is indeed the expected packet */ | 140 | /* if this packet is indeed the expected packet */ |
140 | if (next_id == (q->current_id + 1) % _MAX_SEQU_NUM) { | 141 | if (next_id == (q->current_id + 1) % MAX_SEQU_NUM) { |
141 | q->current_id = next_id; | 142 | q->current_id = next_id; |
142 | q->current_ts = next_ts; | 143 | q->current_ts = next_ts; |
143 | } else { | 144 | } else { |
144 | if (sequence_number_older(next_id, q->current_id, next_ts, q->current_ts)) { | 145 | if (sequence_number_older(next_id, q->current_id, next_ts, q->current_ts)) { |
145 | printf("nextid: %d current: %d\n", next_id, q->current_id); | 146 | printf("nextid: %d current: %d\n", next_id, q->current_id); |
146 | q->current_id = (q->current_id + 1) % _MAX_SEQU_NUM; | 147 | q->current_id = (q->current_id + 1) % MAX_SEQU_NUM; |
147 | *success = 2; /* tell the decoder the packet is lost */ | 148 | *success = 2; /* tell the decoder the packet is lost */ |
148 | return NULL; | 149 | return NULL; |
149 | } else { | 150 | } else { |
@@ -162,8 +163,8 @@ rtp_msg_t *dequeue(struct jitter_buffer *q, int *success) | |||
162 | q->front = 0; | 163 | q->front = 0; |
163 | 164 | ||
164 | *success = 1; | 165 | *success = 1; |
165 | q->current_id = q->queue[front]->_header->_sequence_number; | 166 | q->current_id = q->queue[front]->header->sequnum; |
166 | q->current_ts = q->queue[front]->_header->_timestamp; | 167 | q->current_ts = q->queue[front]->header->timestamp; |
167 | return q->queue[front]; | 168 | return q->queue[front]; |
168 | } | 169 | } |
169 | 170 | ||
@@ -184,7 +185,7 @@ int empty_queue(struct jitter_buffer *q) | |||
184 | return 0; | 185 | return 0; |
185 | } | 186 | } |
186 | 187 | ||
187 | int queue(struct jitter_buffer *q, rtp_msg_t *pk) | 188 | int queue(struct jitter_buffer *q, RTPMessage *pk) |
188 | { | 189 | { |
189 | if (q->size == q->capacity) { | 190 | if (q->size == q->capacity) { |
190 | printf("buffer full, emptying buffer...\n"); | 191 | printf("buffer full, emptying buffer...\n"); |
@@ -214,9 +215,9 @@ int queue(struct jitter_buffer *q, rtp_msg_t *pk) | |||
214 | if (b < 0) | 215 | if (b < 0) |
215 | b += q->capacity; | 216 | b += q->capacity; |
216 | 217 | ||
217 | if (sequence_number_older(q->queue[b]->_header->_sequence_number, q->queue[a]->_header->_sequence_number, | 218 | if (sequence_number_older(q->queue[b]->header->sequnum, q->queue[a]->header->sequnum, |
218 | q->queue[b]->_header->_timestamp, q->queue[a]->_header->_timestamp)) { | 219 | q->queue[b]->header->timestamp, q->queue[a]->header->timestamp)) { |
219 | rtp_msg_t *temp; | 220 | RTPMessage *temp; |
220 | temp = q->queue[a]; | 221 | temp = q->queue[a]; |
221 | q->queue[a] = q->queue[b]; | 222 | q->queue[a] = q->queue[b]; |
222 | q->queue[b] = temp; | 223 | q->queue[b] = temp; |
@@ -487,7 +488,7 @@ void *encode_video_thread(void *arg) | |||
487 | int p = 0; | 488 | int p = 0; |
488 | int err; | 489 | int err; |
489 | int got_packet; | 490 | int got_packet; |
490 | rtp_msg_t *s_video_msg; | 491 | RTPMessage *s_video_msg; |
491 | int video_frame_finished; | 492 | int video_frame_finished; |
492 | AVFrame *s_video_frame; | 493 | AVFrame *s_video_frame; |
493 | AVFrame *webcam_frame; | 494 | AVFrame *webcam_frame; |
@@ -552,18 +553,13 @@ void *encode_video_thread(void *arg) | |||
552 | } | 553 | } |
553 | 554 | ||
554 | pthread_mutex_lock(&cs->rtp_msg_mutex_lock); | 555 | pthread_mutex_lock(&cs->rtp_msg_mutex_lock); |
555 | THREADLOCK() | ||
556 | 556 | ||
557 | if (!enc_video_packet.data) fprintf(stderr, "video packet data is NULL\n"); | 557 | if (!enc_video_packet.data) fprintf(stderr, "video packet data is NULL\n"); |
558 | 558 | ||
559 | s_video_msg = rtp_msg_new ( cs->_rtp_video, enc_video_packet.data, enc_video_packet.size ) ; | 559 | if ( 0 > rtp_send_msg ( cs->_rtp_video, cs->_messenger, enc_video_packet.data, enc_video_packet.size) ) { |
560 | |||
561 | if (!s_video_msg) { | ||
562 | printf("invalid message\n"); | 560 | printf("invalid message\n"); |
563 | } | 561 | } |
564 | 562 | ||
565 | rtp_send_msg ( cs->_rtp_video, s_video_msg, cs->_networking ); | ||
566 | THREADUNLOCK() | ||
567 | pthread_mutex_unlock(&cs->rtp_msg_mutex_lock); | 563 | pthread_mutex_unlock(&cs->rtp_msg_mutex_lock); |
568 | av_free_packet(&enc_video_packet); | 564 | av_free_packet(&enc_video_packet); |
569 | } | 565 | } |
@@ -587,7 +583,7 @@ void *encode_video_thread(void *arg) | |||
587 | void *encode_audio_thread(void *arg) | 583 | void *encode_audio_thread(void *arg) |
588 | { | 584 | { |
589 | codec_state *cs = (codec_state *)arg; | 585 | codec_state *cs = (codec_state *)arg; |
590 | rtp_msg_t *s_audio_msg; | 586 | RTPMessage *s_audio_msg; |
591 | unsigned char encoded_data[4096]; | 587 | unsigned char encoded_data[4096]; |
592 | int encoded_size = 0; | 588 | int encoded_size = 0; |
593 | int16_t frame[4096]; | 589 | int16_t frame[4096]; |
@@ -606,12 +602,11 @@ void *encode_audio_thread(void *arg) | |||
606 | printf("Could not encode audio packet\n"); | 602 | printf("Could not encode audio packet\n"); |
607 | } else { | 603 | } else { |
608 | pthread_mutex_lock(&cs->rtp_msg_mutex_lock); | 604 | pthread_mutex_lock(&cs->rtp_msg_mutex_lock); |
609 | THREADLOCK() | 605 | |
610 | rtp_set_payload_type(cs->_rtp_audio, 96); | 606 | rtp_send_msg ( cs->_rtp_audio, cs->_messenger, encoded_data, encoded_size ); |
611 | s_audio_msg = rtp_msg_new (cs->_rtp_audio, encoded_data, encoded_size) ; | 607 | |
612 | rtp_send_msg ( cs->_rtp_audio, s_audio_msg, cs->_networking ); | ||
613 | pthread_mutex_unlock(&cs->rtp_msg_mutex_lock); | 608 | pthread_mutex_unlock(&cs->rtp_msg_mutex_lock); |
614 | THREADUNLOCK() | 609 | |
615 | } | 610 | } |
616 | } else { | 611 | } else { |
617 | usleep(1000); | 612 | usleep(1000); |
@@ -646,7 +641,7 @@ void *decode_video_thread(void *arg) | |||
646 | { | 641 | { |
647 | codec_state *cs = (codec_state *)arg; | 642 | codec_state *cs = (codec_state *)arg; |
648 | cs->video_stream = 0; | 643 | cs->video_stream = 0; |
649 | rtp_msg_t *r_msg; | 644 | RTPMessage *r_msg; |
650 | int dec_frame_finished; | 645 | int dec_frame_finished; |
651 | AVFrame *r_video_frame; | 646 | AVFrame *r_video_frame; |
652 | r_video_frame = avcodec_alloc_frame(); | 647 | r_video_frame = avcodec_alloc_frame(); |
@@ -659,8 +654,8 @@ void *decode_video_thread(void *arg) | |||
659 | r_msg = rtp_recv_msg ( cs->_rtp_video ); | 654 | r_msg = rtp_recv_msg ( cs->_rtp_video ); |
660 | 655 | ||
661 | if (r_msg) { | 656 | if (r_msg) { |
662 | memcpy(dec_video_packet.data, r_msg->_data, r_msg->_length); | 657 | memcpy(dec_video_packet.data, r_msg->data, r_msg->length); |
663 | dec_video_packet.size = r_msg->_length; | 658 | dec_video_packet.size = r_msg->length; |
664 | avcodec_decode_video2(cs->video_decoder_ctx, r_video_frame, &dec_frame_finished, &dec_video_packet); | 659 | avcodec_decode_video2(cs->video_decoder_ctx, r_video_frame, &dec_frame_finished, &dec_video_packet); |
665 | 660 | ||
666 | if (dec_frame_finished) { | 661 | if (dec_frame_finished) { |
@@ -695,7 +690,7 @@ void *decode_video_thread(void *arg) | |||
695 | void *decode_audio_thread(void *arg) | 690 | void *decode_audio_thread(void *arg) |
696 | { | 691 | { |
697 | codec_state *cs = (codec_state *)arg; | 692 | codec_state *cs = (codec_state *)arg; |
698 | rtp_msg_t *r_msg; | 693 | RTPMessage *r_msg; |
699 | 694 | ||
700 | int frame_size = AUDIO_FRAME_SIZE; | 695 | int frame_size = AUDIO_FRAME_SIZE; |
701 | int data_size; | 696 | int data_size; |
@@ -747,7 +742,7 @@ void *decode_audio_thread(void *arg) | |||
747 | opus_int16 PCM[frame_size]; | 742 | opus_int16 PCM[frame_size]; |
748 | 743 | ||
749 | while (!cs->quit && cs->receive_audio) { | 744 | while (!cs->quit && cs->receive_audio) { |
750 | THREADLOCK() | 745 | |
751 | r_msg = rtp_recv_msg ( cs->_rtp_audio ); | 746 | r_msg = rtp_recv_msg ( cs->_rtp_audio ); |
752 | 747 | ||
753 | if (r_msg) { | 748 | if (r_msg) { |
@@ -765,7 +760,7 @@ void *decode_audio_thread(void *arg) | |||
765 | if (success > 0) { | 760 | if (success > 0) { |
766 | /* good packet */ | 761 | /* good packet */ |
767 | if (success == 1) { | 762 | if (success == 1) { |
768 | dec_frame_len = opus_decode(cs->audio_decoder, r_msg->_data, r_msg->_length, PCM, frame_size, 0); | 763 | dec_frame_len = opus_decode(cs->audio_decoder, r_msg->data, r_msg->length, PCM, frame_size, 0); |
769 | rtp_free_msg(cs->_rtp_audio, r_msg); | 764 | rtp_free_msg(cs->_rtp_audio, r_msg); |
770 | } | 765 | } |
771 | 766 | ||
@@ -806,8 +801,7 @@ void *decode_audio_thread(void *arg) | |||
806 | 801 | ||
807 | } | 802 | } |
808 | } | 803 | } |
809 | 804 | ||
810 | THREADUNLOCK() | ||
811 | usleep(1000); | 805 | usleep(1000); |
812 | } | 806 | } |
813 | 807 | ||
diff --git a/toxmsi/toxmedia.h b/toxav/toxmedia.h index 8734b173..aad299bb 100644 --- a/toxmsi/toxmedia.h +++ b/toxav/toxmedia.h | |||
@@ -126,11 +126,11 @@ typedef struct { | |||
126 | /* rendered video picture, ready for display */ | 126 | /* rendered video picture, ready for display */ |
127 | VideoPicture video_picture; | 127 | VideoPicture video_picture; |
128 | 128 | ||
129 | rtp_session_t *_rtp_video; | 129 | RTPSession *_rtp_video; |
130 | rtp_session_t *_rtp_audio; | 130 | RTPSession *_rtp_audio; |
131 | int socket; | ||
132 | Networking_Core *_networking; | ||
133 | 131 | ||
132 | Tox* _messenger; | ||
133 | |||
134 | pthread_t encode_audio_thread; | 134 | pthread_t encode_audio_thread; |
135 | pthread_t encode_video_thread; | 135 | pthread_t encode_video_thread; |
136 | 136 | ||
@@ -143,11 +143,8 @@ typedef struct { | |||
143 | uint8_t quit; | 143 | uint8_t quit; |
144 | SDL_Event SDL_event; | 144 | SDL_Event SDL_event; |
145 | 145 | ||
146 | msi_session_t *_msi; | 146 | MSISession *_msi; |
147 | uint32_t _frame_rate; | 147 | uint32_t _frame_rate; |
148 | uint16_t _send_port, _recv_port; | ||
149 | int _tox_sock; | ||
150 | //pthread_id _medialoop_id; | ||
151 | 148 | ||
152 | } codec_state; | 149 | } codec_state; |
153 | 150 | ||
@@ -161,7 +158,7 @@ int video_encoder_refresh(codec_state *cs, int bps); | |||
161 | void *encode_video_thread(void *arg); | 158 | void *encode_video_thread(void *arg); |
162 | void *encode_audio_thread(void *arg); | 159 | void *encode_audio_thread(void *arg); |
163 | int video_decoder_refresh(codec_state *cs, int width, int height); | 160 | int video_decoder_refresh(codec_state *cs, int width, int height); |
164 | int handle_rtp_video_packet(codec_state *cs, rtp_msg_t *r_msg); | 161 | int handle_rtp_video_packet(codec_state *cs, RTPMessage *r_msg); |
165 | void *decode_video_thread(void *arg); | 162 | void *decode_video_thread(void *arg); |
166 | void *decode_audio_thread(void *arg); | 163 | void *decode_audio_thread(void *arg); |
167 | 164 | ||
diff --git a/toxav/toxmsi.c b/toxav/toxmsi.c new file mode 100755 index 00000000..cf0914ab --- /dev/null +++ b/toxav/toxmsi.c | |||
@@ -0,0 +1,1337 @@ | |||
1 | /** toxmsi.c | ||
2 | * | ||
3 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | ||
7 | * Tox is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | ||
20 | * | ||
21 | * Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or | ||
22 | * my email: eniz_vukovic@hotmail.com | ||
23 | */ | ||
24 | |||
25 | |||
26 | #ifdef HAVE_CONFIG_H | ||
27 | #include "config.h" | ||
28 | #endif /* HAVE_CONFIG_H */ | ||
29 | |||
30 | #define _BSD_SOURCE | ||
31 | |||
32 | #include "toxmsi.h" | ||
33 | #include "../toxcore/util.h" | ||
34 | #include "../toxcore/network.h" | ||
35 | #include "../toxcore/event.h" | ||
36 | #include "../toxcore/Messenger.h" | ||
37 | |||
38 | #include <assert.h> | ||
39 | #include <unistd.h> | ||
40 | #include <string.h> | ||
41 | #include <stdlib.h> | ||
42 | |||
43 | #define same(x, y) strcmp((const char*) x, (const char*) y) == 0 | ||
44 | |||
45 | #define MSI_MAXMSG_SIZE 1024 | ||
46 | |||
47 | #define TYPE_REQUEST 1 | ||
48 | #define TYPE_RESPONSE 2 | ||
49 | |||
50 | #define VERSION_STRING "0.3.1" | ||
51 | #define VERSION_STRLEN 5 | ||
52 | |||
53 | #define CT_AUDIO_HEADER_VALUE "AUDIO" | ||
54 | #define CT_VIDEO_HEADER_VALUE "VIDEO" | ||
55 | |||
56 | |||
57 | /* Define default timeout for a request. | ||
58 | * There is no behavior specified by the msi on what will | ||
59 | * client do on timeout, but to call timeout callback. | ||
60 | */ | ||
61 | #define m_deftout 10000 /* in milliseconds */ | ||
62 | |||
63 | /** | ||
64 | * Protocol: | ||
65 | * | ||
66 | * | desc. ( 1 byte ) | length ( 2 bytes ) | value ( length bytes ) | | ||
67 | * | ||
68 | * ie. | ||
69 | * | ||
70 | * | 0x1 | 0x0 0x7 | "version" | ||
71 | * | ||
72 | * Means: it's field value with length of 7 bytes and value of "version" | ||
73 | * It's similar to amp protocol | ||
74 | */ | ||
75 | |||
76 | |||
77 | #define GENERIC_HEADER(header) \ | ||
78 | typedef struct _MSIHeader##header { \ | ||
79 | uint8_t* header_value; \ | ||
80 | uint16_t size; \ | ||
81 | } MSIHeader##header; | ||
82 | |||
83 | |||
84 | GENERIC_HEADER ( Version ) | ||
85 | GENERIC_HEADER ( Request ) | ||
86 | GENERIC_HEADER ( Response ) | ||
87 | GENERIC_HEADER ( CallType ) | ||
88 | GENERIC_HEADER ( UserAgent ) | ||
89 | GENERIC_HEADER ( CallId ) | ||
90 | GENERIC_HEADER ( Info ) | ||
91 | GENERIC_HEADER ( Reason ) | ||
92 | GENERIC_HEADER ( CryptoKey ) | ||
93 | GENERIC_HEADER ( Nonce ) | ||
94 | |||
95 | |||
96 | /** | ||
97 | * @brief This is the message structure. It contains all of the headers and | ||
98 | * destination/source of the message stored in friend_id. | ||
99 | * | ||
100 | */ | ||
101 | typedef struct _MSIMessage { | ||
102 | |||
103 | MSIHeaderVersion version; | ||
104 | MSIHeaderRequest request; | ||
105 | MSIHeaderResponse response; | ||
106 | MSIHeaderCallType calltype; | ||
107 | MSIHeaderUserAgent useragent; | ||
108 | MSIHeaderInfo info; | ||
109 | MSIHeaderReason reason; | ||
110 | MSIHeaderCallId callid; | ||
111 | MSIHeaderCryptoKey cryptokey; | ||
112 | MSIHeaderNonce nonce; | ||
113 | |||
114 | struct _MSIMessage* next; | ||
115 | |||
116 | int friend_id; | ||
117 | |||
118 | } MSIMessage; | ||
119 | |||
120 | |||
121 | |||
122 | static MSICallback callbacks[9] = {0}; | ||
123 | |||
124 | |||
125 | /* define strings for the identifiers */ | ||
126 | #define VERSION_FIELD "Version" | ||
127 | #define REQUEST_FIELD "Request" | ||
128 | #define RESPONSE_FIELD "Response" | ||
129 | #define INFO_FIELD "INFO" | ||
130 | #define REASON_FIELD "Reason" | ||
131 | #define CALLTYPE_FIELD "Call-type" | ||
132 | #define USERAGENT_FIELD "User-agent" | ||
133 | #define CALLID_FIELD "Call-id" | ||
134 | #define CRYPTOKEY_FIELD "Crypto-key" | ||
135 | #define NONCE_FIELD "Nonce" | ||
136 | |||
137 | /* protocol descriptors */ | ||
138 | #define end_byte 0x0 | ||
139 | #define field_byte 0x1 | ||
140 | #define value_byte 0x2 | ||
141 | |||
142 | |||
143 | typedef enum { | ||
144 | invite, | ||
145 | start, | ||
146 | cancel, | ||
147 | reject, | ||
148 | end, | ||
149 | |||
150 | } MSIRequest; | ||
151 | |||
152 | |||
153 | /** | ||
154 | * @brief Get string value for request. | ||
155 | * | ||
156 | * @param request The request. | ||
157 | * @return const uint8_t* The string | ||
158 | */ | ||
159 | static inline const uint8_t *stringify_request ( MSIRequest request ) { | ||
160 | static const uint8_t* strings[] = { | ||
161 | ( uint8_t* ) "INVITE", | ||
162 | ( uint8_t* ) "START", | ||
163 | ( uint8_t* ) "CANCEL", | ||
164 | ( uint8_t* ) "REJECT", | ||
165 | ( uint8_t* ) "END" | ||
166 | }; | ||
167 | |||
168 | return strings[request]; | ||
169 | } | ||
170 | |||
171 | |||
172 | typedef enum { | ||
173 | ringing, | ||
174 | starting, | ||
175 | ending, | ||
176 | error | ||
177 | |||
178 | } MSIResponse; | ||
179 | |||
180 | |||
181 | /** | ||
182 | * @brief Get string value for response. | ||
183 | * | ||
184 | * @param response The response. | ||
185 | * @return const uint8_t* The string | ||
186 | */ | ||
187 | static inline const uint8_t *stringify_response ( MSIResponse response ) { | ||
188 | static const uint8_t* strings[] = { | ||
189 | ( uint8_t* ) "ringing", | ||
190 | ( uint8_t* ) "starting", | ||
191 | ( uint8_t* ) "ending", | ||
192 | ( uint8_t* ) "error" | ||
193 | }; | ||
194 | |||
195 | return strings[response]; | ||
196 | } | ||
197 | |||
198 | |||
199 | #define ON_HEADER(iterator, header, descriptor, size_const) \ | ||
200 | ( memcmp(iterator, descriptor, size_const) == 0){ /* Okay */ \ | ||
201 | iterator += size_const; /* Set iterator at begining of value part */ \ | ||
202 | if ( *iterator != value_byte ) { assert(0); return -1; }\ | ||
203 | iterator ++;\ | ||
204 | uint16_t _value_size = (uint16_t) *(iterator ) << 8 | \ | ||
205 | (uint16_t) *(iterator + 1); \ | ||
206 | header.header_value = calloc(sizeof(uint8_t), _value_size); \ | ||
207 | header.size = _value_size; \ | ||
208 | memcpy(header.header_value, iterator + 2, _value_size);\ | ||
209 | iterator = iterator + 2 + _value_size; /* set iterator at new header or end_byte */ \ | ||
210 | } | ||
211 | |||
212 | /** | ||
213 | * @brief Parse raw 'data' received from socket into MSIMessage struct. | ||
214 | * Every message has to have end value of 'end_byte' or _undefined_ behavior | ||
215 | * occures. The best practice is to check the end of the message at the handle_packet. | ||
216 | * | ||
217 | * @param msg Container. | ||
218 | * @param data The data. | ||
219 | * @return int | ||
220 | * @retval -1 Error occured. | ||
221 | * @retval 0 Success. | ||
222 | */ | ||
223 | int parse_raw_data ( MSIMessage* msg, const uint8_t* data ) { | ||
224 | assert ( msg ); | ||
225 | |||
226 | const uint8_t* _it = data; | ||
227 | |||
228 | while ( *_it ) {/* until end_byte is hit */ | ||
229 | |||
230 | if ( *_it == field_byte ) { | ||
231 | uint16_t _size = ( uint16_t ) * ( _it + 1 ) << 8 | | ||
232 | ( uint16_t ) * ( _it + 2 ); | ||
233 | |||
234 | _it += 3; /*place it at the field value beginning*/ | ||
235 | |||
236 | switch ( _size ) { /* Compare the size of the hardcoded values ( vary fast and convenient ) */ | ||
237 | |||
238 | case 4: { /* INFO header */ | ||
239 | if ON_HEADER ( _it, msg->info, INFO_FIELD, 4 ) | ||
240 | } | ||
241 | break; | ||
242 | |||
243 | case 5: { /* NONCE header */ | ||
244 | if ON_HEADER ( _it, msg->nonce, NONCE_FIELD, 5 ) | ||
245 | } | ||
246 | break; | ||
247 | |||
248 | case 6: { /* Reason header */ | ||
249 | if ON_HEADER ( _it, msg->reason, REASON_FIELD, 6 ) | ||
250 | } | ||
251 | break; | ||
252 | |||
253 | case 7: { /* Version, Request, Call-id headers */ | ||
254 | if ON_HEADER ( _it, msg->version, VERSION_FIELD, 7 ) | ||
255 | else if ON_HEADER ( _it, msg->request, REQUEST_FIELD, 7 ) | ||
256 | else if ON_HEADER ( _it, msg->callid, CALLID_FIELD, 7 ) | ||
257 | } | ||
258 | break; | ||
259 | |||
260 | case 8: { /* Response header */ | ||
261 | if ON_HEADER ( _it, msg->response, RESPONSE_FIELD, 8 ) | ||
262 | } | ||
263 | break; | ||
264 | |||
265 | case 9: { /* Call-type header */ | ||
266 | if ON_HEADER ( _it, msg->calltype, CALLTYPE_FIELD, 9 ) | ||
267 | } | ||
268 | break; | ||
269 | |||
270 | case 10: { /* User-agent, Crypto-key headers */ | ||
271 | if ON_HEADER ( _it, msg->useragent, USERAGENT_FIELD, 10 ) | ||
272 | else if ON_HEADER ( _it, msg->cryptokey, CRYPTOKEY_FIELD, 10 ) | ||
273 | } | ||
274 | break; | ||
275 | |||
276 | default: | ||
277 | return -1; | ||
278 | } | ||
279 | } else return -1; | ||
280 | /* If it's anything else return failure as the message is invalid */ | ||
281 | |||
282 | } | ||
283 | |||
284 | return 0; | ||
285 | } | ||
286 | |||
287 | |||
288 | #define ALLOCATE_HEADER( var, mheader_value, t_size) \ | ||
289 | var.header_value = calloc(sizeof *mheader_value, t_size); \ | ||
290 | memcpy(var.header_value, mheader_value, t_size); \ | ||
291 | var.size = t_size; | ||
292 | |||
293 | |||
294 | /** | ||
295 | * @brief Speaks for it self. | ||
296 | * | ||
297 | * @param msg The message. | ||
298 | * @return void | ||
299 | */ | ||
300 | void free_message ( MSIMessage* msg ) { | ||
301 | assert ( msg ); | ||
302 | |||
303 | free ( msg->calltype.header_value ); | ||
304 | free ( msg->request.header_value ); | ||
305 | free ( msg->response.header_value ); | ||
306 | free ( msg->useragent.header_value ); | ||
307 | free ( msg->version.header_value ); | ||
308 | free ( msg->info.header_value ); | ||
309 | free ( msg->cryptokey.header_value ); | ||
310 | free ( msg->nonce.header_value ); | ||
311 | free ( msg->reason.header_value ); | ||
312 | free ( msg->callid.header_value ); | ||
313 | |||
314 | free ( msg ); | ||
315 | } | ||
316 | |||
317 | |||
318 | /** | ||
319 | * @brief Create the message. | ||
320 | * | ||
321 | * @param type Request or response. | ||
322 | * @param type_id Type of request/response. | ||
323 | * @return MSIMessage* Created message. | ||
324 | * @retval NULL Error occured. | ||
325 | */ | ||
326 | MSIMessage* msi_new_message ( uint8_t type, const uint8_t* type_id ) { | ||
327 | MSIMessage* _retu = calloc ( sizeof ( MSIMessage ), 1 ); | ||
328 | assert ( _retu ); | ||
329 | |||
330 | memset ( _retu, 0, sizeof ( MSIMessage ) ); | ||
331 | |||
332 | if ( type == TYPE_REQUEST ) { | ||
333 | ALLOCATE_HEADER ( _retu->request, type_id, strlen ( type_id ) ) | ||
334 | |||
335 | } else if ( type == TYPE_RESPONSE ) { | ||
336 | ALLOCATE_HEADER ( _retu->response, type_id, strlen ( type_id ) ) | ||
337 | |||
338 | } else { | ||
339 | free_message ( _retu ); | ||
340 | return NULL; | ||
341 | } | ||
342 | |||
343 | ALLOCATE_HEADER ( _retu->version, VERSION_STRING, strlen ( VERSION_STRING ) ) | ||
344 | |||
345 | return _retu; | ||
346 | } | ||
347 | |||
348 | |||
349 | /** | ||
350 | * @brief Parse data from handle_packet. | ||
351 | * | ||
352 | * @param data The data. | ||
353 | * @return MSIMessage* Parsed message. | ||
354 | * @retval NULL Error occured. | ||
355 | */ | ||
356 | MSIMessage* parse_message ( const uint8_t* data ) { | ||
357 | assert ( data ); | ||
358 | |||
359 | MSIMessage* _retu = calloc ( sizeof ( MSIMessage ), 1 ); | ||
360 | assert ( _retu ); | ||
361 | |||
362 | memset ( _retu, 0, sizeof ( MSIMessage ) ); | ||
363 | |||
364 | if ( parse_raw_data ( _retu, data ) == -1 ) { | ||
365 | |||
366 | free_message ( _retu ); | ||
367 | return NULL; | ||
368 | } | ||
369 | |||
370 | if ( !_retu->version.header_value || VERSION_STRLEN != _retu->version.size || | ||
371 | memcmp ( _retu->version.header_value, VERSION_STRING, VERSION_STRLEN ) != 0 ) { | ||
372 | |||
373 | free_message ( _retu ); | ||
374 | return NULL; | ||
375 | } | ||
376 | |||
377 | return _retu; | ||
378 | } | ||
379 | |||
380 | |||
381 | |||
382 | /** | ||
383 | * @brief Speaks for it self. | ||
384 | * | ||
385 | * @param dest Container. | ||
386 | * @param header_field Field. | ||
387 | * @param header_value Field value. | ||
388 | * @param value_len Length of field value. | ||
389 | * @param length Pointer to container length. | ||
390 | * @return uint8_t* Iterated container. | ||
391 | */ | ||
392 | uint8_t* append_header_to_string ( | ||
393 | uint8_t* dest, | ||
394 | const uint8_t* header_field, | ||
395 | const uint8_t* header_value, | ||
396 | uint16_t value_len, | ||
397 | uint16_t* length ) | ||
398 | { | ||
399 | assert ( dest ); | ||
400 | assert ( header_value ); | ||
401 | assert ( header_field ); | ||
402 | |||
403 | const uint8_t* _hvit = header_value; | ||
404 | uint16_t _total = 6 + value_len; /* 6 is known plus header value len + field len*/ | ||
405 | |||
406 | *dest = field_byte; /* Set the first byte */ | ||
407 | |||
408 | uint8_t* _getback_byte = dest + 1; /* remeber the byte we were on */ | ||
409 | dest += 3; /* swith to 4th byte where field value starts */ | ||
410 | |||
411 | /* Now set the field value and calculate it's length */ | ||
412 | uint16_t _i = 0; | ||
413 | for ( ; header_field[_i]; ++_i ) { | ||
414 | *dest = header_field[_i]; | ||
415 | ++dest; | ||
416 | }; | ||
417 | _total += _i; | ||
418 | |||
419 | /* Now set the length of the field byte */ | ||
420 | *_getback_byte = ( uint8_t ) _i >> 8; | ||
421 | _getback_byte++; | ||
422 | *_getback_byte = ( uint8_t ) _i; | ||
423 | |||
424 | /* for value part do it regulary */ | ||
425 | *dest = value_byte; | ||
426 | dest++; | ||
427 | |||
428 | *dest = ( uint8_t ) value_len >> 8; | ||
429 | dest++; | ||
430 | *dest = ( uint8_t ) value_len; | ||
431 | dest++; | ||
432 | |||
433 | for ( _i = value_len; _i; --_i ) { | ||
434 | *dest = *_hvit; | ||
435 | ++_hvit; | ||
436 | ++dest; | ||
437 | } | ||
438 | |||
439 | *length += _total; | ||
440 | return dest; | ||
441 | } | ||
442 | |||
443 | |||
444 | #define CLEAN_ASSIGN(added, var, field, header)\ | ||
445 | if ( header.header_value ) { var = append_header_to_string(var, (const uint8_t*)field, header.header_value, header.size, &added); } | ||
446 | |||
447 | |||
448 | /** | ||
449 | * @brief Convert MSIMessage struct to _sendable_ string. | ||
450 | * | ||
451 | * @param msg The message. | ||
452 | * @param dest Destination. | ||
453 | * @return uint16_t It's final size. | ||
454 | */ | ||
455 | uint16_t message_to_string ( MSIMessage* msg, uint8_t* dest ) { | ||
456 | assert ( msg ); | ||
457 | assert ( dest ); | ||
458 | |||
459 | uint8_t* _iterated = dest; | ||
460 | uint16_t _size = 0; | ||
461 | |||
462 | CLEAN_ASSIGN ( _size, _iterated, VERSION_FIELD, msg->version ); | ||
463 | CLEAN_ASSIGN ( _size, _iterated, REQUEST_FIELD, msg->request ); | ||
464 | CLEAN_ASSIGN ( _size, _iterated, RESPONSE_FIELD, msg->response ); | ||
465 | CLEAN_ASSIGN ( _size, _iterated, CALLTYPE_FIELD, msg->calltype ); | ||
466 | CLEAN_ASSIGN ( _size, _iterated, USERAGENT_FIELD, msg->useragent ); | ||
467 | CLEAN_ASSIGN ( _size, _iterated, INFO_FIELD, msg->info ); | ||
468 | CLEAN_ASSIGN ( _size, _iterated, CALLID_FIELD, msg->callid ); | ||
469 | CLEAN_ASSIGN ( _size, _iterated, REASON_FIELD, msg->reason ); | ||
470 | CLEAN_ASSIGN ( _size, _iterated, CRYPTOKEY_FIELD, msg->cryptokey ); | ||
471 | CLEAN_ASSIGN ( _size, _iterated, NONCE_FIELD, msg->nonce ); | ||
472 | |||
473 | *_iterated = end_byte; | ||
474 | _size ++; | ||
475 | |||
476 | return _size; | ||
477 | } | ||
478 | |||
479 | |||
480 | #define GENERIC_SETTER_DEFINITION(header) \ | ||
481 | void msi_msg_set_##header ( MSIMessage* _msg, const uint8_t* header_value, uint16_t _size ) \ | ||
482 | { assert(_msg); assert(header_value); \ | ||
483 | free(_msg->header.header_value); \ | ||
484 | ALLOCATE_HEADER( _msg->header, header_value, _size )} | ||
485 | |||
486 | GENERIC_SETTER_DEFINITION ( calltype ) | ||
487 | GENERIC_SETTER_DEFINITION ( useragent ) | ||
488 | GENERIC_SETTER_DEFINITION ( reason ) | ||
489 | GENERIC_SETTER_DEFINITION ( info ) | ||
490 | GENERIC_SETTER_DEFINITION ( callid ) | ||
491 | GENERIC_SETTER_DEFINITION ( cryptokey ) | ||
492 | GENERIC_SETTER_DEFINITION ( nonce ) | ||
493 | |||
494 | |||
495 | /** | ||
496 | * @brief Generate _random_ alphanumerical string. | ||
497 | * | ||
498 | * @param str Destination. | ||
499 | * @param size Size of string. | ||
500 | * @return void | ||
501 | */ | ||
502 | void t_randomstr ( uint8_t* str, size_t size ) { | ||
503 | assert ( str ); | ||
504 | |||
505 | static const uint8_t _bytes[] = | ||
506 | "0123456789" | ||
507 | "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||
508 | "abcdefghijklmnopqrstuvwxyz"; | ||
509 | |||
510 | int _it = 0; | ||
511 | |||
512 | for ( ; _it < size; _it++ ) { | ||
513 | str[_it] = _bytes[ randombytes_random() % 61 ]; | ||
514 | } | ||
515 | } | ||
516 | |||
517 | |||
518 | typedef enum { | ||
519 | error_deadcall = 1, /* has call id but it's from old call */ | ||
520 | error_id_mismatch, /* non-existing call */ | ||
521 | |||
522 | error_no_callid, /* not having call id */ | ||
523 | error_no_call, /* no call in session */ | ||
524 | error_no_crypto_key, /* no crypto key */ | ||
525 | |||
526 | error_busy, | ||
527 | |||
528 | } MSICallError; /* Error codes */ | ||
529 | |||
530 | |||
531 | /** | ||
532 | * @brief Stringify error code. | ||
533 | * | ||
534 | * @param error_code The code. | ||
535 | * @return const uint8_t* The string. | ||
536 | */ | ||
537 | static inline const uint8_t *stringify_error ( MSICallError error_code ) { | ||
538 | static const uint8_t* strings[] = { | ||
539 | ( uint8_t* ) "", | ||
540 | ( uint8_t* ) "Using dead call", | ||
541 | ( uint8_t* ) "Call id not set to any call", | ||
542 | ( uint8_t* ) "Call id not available", | ||
543 | ( uint8_t* ) "No active call in session", | ||
544 | ( uint8_t* ) "No Crypto-key set", | ||
545 | ( uint8_t* ) "Callee busy" | ||
546 | }; | ||
547 | |||
548 | return strings[error_code]; | ||
549 | } | ||
550 | |||
551 | |||
552 | /** | ||
553 | * @brief Convert error_code into string. | ||
554 | * | ||
555 | * @param error_code The code. | ||
556 | * @return const uint8_t* The string. | ||
557 | */ | ||
558 | static inline const uint8_t *stringify_error_code ( MSICallError error_code ) { | ||
559 | static const uint8_t* strings[] = { | ||
560 | ( uint8_t* ) "", | ||
561 | ( uint8_t* ) "1", | ||
562 | ( uint8_t* ) "2", | ||
563 | ( uint8_t* ) "3", | ||
564 | ( uint8_t* ) "4", | ||
565 | ( uint8_t* ) "5", | ||
566 | ( uint8_t* ) "6" | ||
567 | }; | ||
568 | |||
569 | return strings[error_code]; | ||
570 | } | ||
571 | |||
572 | |||
573 | /** | ||
574 | * @brief Speaks for it self. | ||
575 | * | ||
576 | * @param session Control session. | ||
577 | * @param msg The message. | ||
578 | * @param to Where to. | ||
579 | * @return int | ||
580 | * @retval -1 Error occured. | ||
581 | * @retval 0 Success. | ||
582 | */ | ||
583 | int send_message ( MSISession* session, MSIMessage* msg, uint32_t to ) | ||
584 | { | ||
585 | msi_msg_set_callid ( msg, session->call->id, CALL_ID_LEN ); | ||
586 | |||
587 | uint8_t _msg_string_final [MSI_MAXMSG_SIZE]; | ||
588 | uint16_t _length = message_to_string ( msg, _msg_string_final ); | ||
589 | |||
590 | return m_msi_packet((struct Messenger*) session->messenger_handle, to, _msg_string_final, _length) ? 0 : -1; | ||
591 | } | ||
592 | |||
593 | |||
594 | /** | ||
595 | * @brief Speaks for it self. | ||
596 | * | ||
597 | * @param session Control session. | ||
598 | * @param msg The message. | ||
599 | * @param peer_id The peer. | ||
600 | * @return void | ||
601 | */ | ||
602 | void flush_peer_type ( MSISession* session, MSIMessage* msg, int peer_id ) { | ||
603 | if ( msg->calltype.header_value ) { | ||
604 | if ( strcmp ( ( const char* ) msg->calltype.header_value, CT_AUDIO_HEADER_VALUE ) == 0 ) { | ||
605 | session->call->type_peer[peer_id] = type_audio; | ||
606 | |||
607 | } else if ( strcmp ( ( const char* ) msg->calltype.header_value, CT_VIDEO_HEADER_VALUE ) == 0 ) { | ||
608 | session->call->type_peer[peer_id] = type_video; | ||
609 | } else {} /* Error */ | ||
610 | } else {} /* Error */ | ||
611 | } | ||
612 | |||
613 | |||
614 | |||
615 | /** | ||
616 | * @brief Sends error response to peer. | ||
617 | * | ||
618 | * @param session The session. | ||
619 | * @param errid The id. | ||
620 | * @param to Where to? | ||
621 | * @return int | ||
622 | * @retval 0 It's always success. | ||
623 | */ | ||
624 | int handle_error ( MSISession* session, MSICallError errid, uint32_t to ) { | ||
625 | MSIMessage* _msg_error = msi_new_message ( TYPE_RESPONSE, stringify_response ( error ) ); | ||
626 | |||
627 | const uint8_t* _error_code_str = stringify_error_code ( errid ); | ||
628 | |||
629 | msi_msg_set_reason ( _msg_error, _error_code_str, strlen ( ( const char* ) _error_code_str ) ); | ||
630 | send_message ( session, _msg_error, to ); | ||
631 | free_message ( _msg_error ); | ||
632 | |||
633 | session->last_error_id = errid; | ||
634 | session->last_error_str = stringify_error ( errid ); | ||
635 | |||
636 | event.rise ( callbacks[cb_error], session ); | ||
637 | |||
638 | return 0; | ||
639 | } | ||
640 | |||
641 | |||
642 | /** | ||
643 | * @brief Determine the error if any. | ||
644 | * | ||
645 | * @param session Control session. | ||
646 | * @param msg The message. | ||
647 | * @return int | ||
648 | * @retval -1 No error. | ||
649 | * @retval 0 Error occured and response sent. | ||
650 | */ | ||
651 | int has_call_error ( MSISession* session, MSIMessage* msg ) { | ||
652 | if ( !msg->callid.header_value ) { | ||
653 | return handle_error ( session, error_no_callid, msg->friend_id ); | ||
654 | |||
655 | } else if ( !session->call ) { | ||
656 | return handle_error ( session, error_no_call, msg->friend_id ); | ||
657 | |||
658 | } else if ( memcmp ( session->call->id, msg->callid.header_value, CALL_ID_LEN ) != 0 ) { | ||
659 | return handle_error ( session, error_id_mismatch, msg->friend_id ); | ||
660 | |||
661 | } | ||
662 | |||
663 | return -1; | ||
664 | } | ||
665 | |||
666 | |||
667 | /** | ||
668 | * @brief Function called at request timeout. | ||
669 | * | ||
670 | * @param arg Control session | ||
671 | * @return void* | ||
672 | */ | ||
673 | void* handle_timeout ( void* arg ) | ||
674 | { | ||
675 | /* Send hangup either way */ | ||
676 | MSISession* _session = arg; | ||
677 | |||
678 | uint32_t* _peers = _session->call->peers; | ||
679 | uint16_t _peer_count = _session->call->peer_count; | ||
680 | |||
681 | |||
682 | /* Cancel all? */ | ||
683 | uint16_t _it = 0; | ||
684 | for ( ; _it < _peer_count; _it++ ) | ||
685 | msi_cancel ( arg, _peers[_it] ); | ||
686 | |||
687 | |||
688 | ( *callbacks[cb_timeout] ) ( arg ); | ||
689 | ( *callbacks[cb_ending ] ) ( arg ); | ||
690 | |||
691 | return NULL; | ||
692 | } | ||
693 | |||
694 | |||
695 | /** | ||
696 | * @brief Add peer to peer list. | ||
697 | * | ||
698 | * @param call What call. | ||
699 | * @param peer_id Its id. | ||
700 | * @return void | ||
701 | */ | ||
702 | void add_peer( MSICall* call, int peer_id ) | ||
703 | { | ||
704 | if ( !call->peers ) { | ||
705 | call->peers = calloc(sizeof(int), 1); | ||
706 | call->peer_count = 1; | ||
707 | } else{ | ||
708 | call->peer_count ++; | ||
709 | call->peers = realloc( call->peers, sizeof(int) * call->peer_count); | ||
710 | } | ||
711 | |||
712 | call->peers[call->peer_count - 1] = peer_id; | ||
713 | } | ||
714 | |||
715 | |||
716 | /** | ||
717 | * @brief BASIC call flow: | ||
718 | * | ||
719 | * ALICE BOB | ||
720 | * | invite --> | | ||
721 | * | | | ||
722 | * | <-- ringing | | ||
723 | * | | | ||
724 | * | <-- starting | | ||
725 | * | | | ||
726 | * | start --> | | ||
727 | * | | | ||
728 | * | <-- MEDIA TRANS --> | | ||
729 | * | | | ||
730 | * | end --> | | ||
731 | * | | | ||
732 | * | <-- ending | | ||
733 | * | ||
734 | * Alice calls Bob by sending invite packet. | ||
735 | * Bob recvs the packet and sends an ringing packet; | ||
736 | * which notifies Alice that her invite is acknowledged. | ||
737 | * Ringing screen shown on both sides. | ||
738 | * Bob accepts the invite for a call by sending starting packet. | ||
739 | * Alice recvs the starting packet and sends the started packet to | ||
740 | * inform Bob that she recved the starting packet. | ||
741 | * Now the media transmission is established ( i.e. RTP transmission ). | ||
742 | * Alice hangs up and sends end packet. | ||
743 | * Bob recves the end packet and sends ending packet | ||
744 | * as the acknowledgement that the call is ending. | ||
745 | * | ||
746 | * | ||
747 | */ | ||
748 | void msi_handle_packet ( Messenger* messenger, int source, uint8_t* data, uint16_t length, void* object ) | ||
749 | { | ||
750 | MSISession* _session = object; | ||
751 | MSIMessage* _msg; | ||
752 | |||
753 | _msg = parse_message ( data ); | ||
754 | |||
755 | if ( !_msg ) return; | ||
756 | |||
757 | _msg->friend_id = source; | ||
758 | |||
759 | |||
760 | /* Now handle message */ | ||
761 | |||
762 | if ( _msg->request.header_value ) { /* Handle request */ | ||
763 | |||
764 | const uint8_t* _request_value = _msg->request.header_value; | ||
765 | |||
766 | if ( same ( _request_value, stringify_request ( invite ) ) ) { | ||
767 | handle_recv_invite ( _session, _msg ); | ||
768 | |||
769 | } else if ( same ( _request_value, stringify_request ( start ) ) ) { | ||
770 | handle_recv_start ( _session, _msg ); | ||
771 | |||
772 | } else if ( same ( _request_value, stringify_request ( cancel ) ) ) { | ||
773 | handle_recv_cancel ( _session, _msg ); | ||
774 | |||
775 | } else if ( same ( _request_value, stringify_request ( reject ) ) ) { | ||
776 | handle_recv_reject ( _session, _msg ); | ||
777 | |||
778 | } else if ( same ( _request_value, stringify_request ( end ) ) ) { | ||
779 | handle_recv_end ( _session, _msg ); | ||
780 | } | ||
781 | |||
782 | else { | ||
783 | free_message ( _msg ); | ||
784 | return; | ||
785 | } | ||
786 | |||
787 | } else if ( _msg->response.header_value ) { /* Handle response */ | ||
788 | |||
789 | const uint8_t* _response_value = _msg->response.header_value; | ||
790 | |||
791 | if ( same ( _response_value, stringify_response ( ringing ) ) ) { | ||
792 | handle_recv_ringing ( _session, _msg ); | ||
793 | |||
794 | } else if ( same ( _response_value, stringify_response ( starting ) ) ) { | ||
795 | handle_recv_starting ( _session, _msg ); | ||
796 | |||
797 | } else if ( same ( _response_value, stringify_response ( ending ) ) ) { | ||
798 | handle_recv_ending ( _session, _msg ); | ||
799 | |||
800 | } else if ( same ( _response_value, stringify_response ( error ) ) ) { | ||
801 | handle_recv_error ( _session, _msg ); | ||
802 | } else { | ||
803 | free_message ( _msg ); | ||
804 | return; | ||
805 | } | ||
806 | |||
807 | /* Got response so cancel timer */ | ||
808 | if ( _session->call ) | ||
809 | event.timer_release ( _session->call->request_timer_id ); | ||
810 | |||
811 | } | ||
812 | |||
813 | free_message ( _msg ); | ||
814 | } | ||
815 | |||
816 | |||
817 | /** | ||
818 | * @brief Speaks for it self. | ||
819 | * | ||
820 | * @param session Control session. | ||
821 | * @param peers Amount of peers. (Currently it only supports 1) | ||
822 | * @param ringing_timeout Ringing timeout. | ||
823 | * @return MSICall* The created call. | ||
824 | */ | ||
825 | MSICall* init_call ( MSISession* session, int peers, int ringing_timeout ) { | ||
826 | assert ( session ); | ||
827 | assert ( peers ); | ||
828 | |||
829 | MSICall* _call = calloc ( sizeof ( MSICall ), 1 ); | ||
830 | _call->type_peer = calloc ( sizeof ( MSICallType ), peers ); | ||
831 | |||
832 | assert ( _call ); | ||
833 | assert ( _call->type_peer ); | ||
834 | |||
835 | /*_call->_participant_count = _peers;*/ | ||
836 | |||
837 | _call->request_timer_id = 0; | ||
838 | _call->ringing_timer_id = 0; | ||
839 | |||
840 | _call->key_local = NULL; | ||
841 | _call->key_peer = NULL; | ||
842 | _call->nonce_local = NULL; | ||
843 | _call->nonce_peer = NULL; | ||
844 | |||
845 | _call->ringing_tout_ms = ringing_timeout; | ||
846 | |||
847 | pthread_mutex_init ( &_call->mutex, NULL ); | ||
848 | |||
849 | return _call; | ||
850 | } | ||
851 | |||
852 | |||
853 | /** | ||
854 | * @brief Terminate the call. | ||
855 | * | ||
856 | * @param session Control session. | ||
857 | * @return int | ||
858 | * @retval -1 Error occured. | ||
859 | * @retval 0 Success. | ||
860 | */ | ||
861 | int terminate_call ( MSISession* session ) { | ||
862 | assert ( session ); | ||
863 | |||
864 | if ( !session->call ) | ||
865 | return -1; | ||
866 | |||
867 | |||
868 | /* Check event loop and cancel timed events if there are any | ||
869 | * Notice: This has to be done before possibly | ||
870 | * locking the mutex the second time | ||
871 | */ | ||
872 | event.timer_release ( session->call->request_timer_id ); | ||
873 | event.timer_release ( session->call->ringing_timer_id ); | ||
874 | |||
875 | /* Get a handle */ | ||
876 | pthread_mutex_lock ( &session->call->mutex ); | ||
877 | |||
878 | MSICall* _call = session->call; | ||
879 | session->call = NULL; | ||
880 | |||
881 | free ( _call->type_peer ); | ||
882 | free ( _call->key_local ); | ||
883 | free ( _call->key_peer ); | ||
884 | free ( _call->peers); | ||
885 | |||
886 | /* Release handle */ | ||
887 | pthread_mutex_unlock ( &_call->mutex ); | ||
888 | |||
889 | pthread_mutex_destroy ( &_call->mutex ); | ||
890 | |||
891 | free ( _call ); | ||
892 | |||
893 | return 0; | ||
894 | } | ||
895 | |||
896 | |||
897 | /********** Request handlers **********/ | ||
898 | int handle_recv_invite ( MSISession* session, MSIMessage* msg ) { | ||
899 | assert ( session ); | ||
900 | |||
901 | if ( session->call ) { | ||
902 | handle_error ( session, error_busy, msg->friend_id ); | ||
903 | return 0; | ||
904 | } | ||
905 | if ( !msg->callid.header_value ) { | ||
906 | handle_error ( session, error_no_callid, msg->friend_id ); | ||
907 | return 0; | ||
908 | } | ||
909 | |||
910 | session->call = init_call ( session, 1, 0 ); | ||
911 | memcpy ( session->call->id, msg->callid.header_value, CALL_ID_LEN ); | ||
912 | session->call->state = call_starting; | ||
913 | |||
914 | add_peer( session->call, msg->friend_id); | ||
915 | |||
916 | flush_peer_type ( session, msg, 0 ); | ||
917 | |||
918 | MSIMessage* _msg_ringing = msi_new_message ( TYPE_RESPONSE, stringify_response ( ringing ) ); | ||
919 | send_message ( session, _msg_ringing, msg->friend_id ); | ||
920 | free_message ( _msg_ringing ); | ||
921 | |||
922 | event.rise ( callbacks[cb_oninvite], session ); | ||
923 | |||
924 | return 1; | ||
925 | } | ||
926 | int handle_recv_start ( MSISession* session, MSIMessage* msg ) { | ||
927 | assert ( session ); | ||
928 | |||
929 | if ( has_call_error ( session, msg ) == 0 ) | ||
930 | return 0; | ||
931 | |||
932 | if ( !msg->cryptokey.header_value ) | ||
933 | return handle_error ( session, error_no_crypto_key, msg->friend_id ); | ||
934 | |||
935 | session->call->state = call_active; | ||
936 | |||
937 | session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | ||
938 | memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES ); | ||
939 | |||
940 | session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | ||
941 | memcpy ( session->call->nonce_peer, msg->nonce.header_value, crypto_box_NONCEBYTES ); | ||
942 | |||
943 | flush_peer_type ( session, msg, 0 ); | ||
944 | |||
945 | event.rise ( callbacks[cb_onstart], session ); | ||
946 | |||
947 | return 1; | ||
948 | } | ||
949 | int handle_recv_reject ( MSISession* session, MSIMessage* msg ) { | ||
950 | assert ( session ); | ||
951 | |||
952 | if ( has_call_error ( session, msg ) == 0 ) | ||
953 | return 0; | ||
954 | |||
955 | |||
956 | MSIMessage* _msg_end = msi_new_message ( TYPE_REQUEST, stringify_request ( end ) ); | ||
957 | send_message ( session, _msg_end, msg->friend_id ); | ||
958 | free_message ( _msg_end ); | ||
959 | |||
960 | event.timer_release ( session->call->request_timer_id ); | ||
961 | event.rise ( callbacks[cb_onreject], session ); | ||
962 | session->call->request_timer_id = event.timer_alloc ( handle_timeout, session, m_deftout ); | ||
963 | |||
964 | return 1; | ||
965 | } | ||
966 | int handle_recv_cancel ( MSISession* session, MSIMessage* msg ) { | ||
967 | assert ( session ); | ||
968 | |||
969 | if ( has_call_error ( session, msg ) == 0 ) | ||
970 | return 0; | ||
971 | |||
972 | |||
973 | terminate_call ( session ); | ||
974 | |||
975 | event.rise ( callbacks[cb_oncancel], session ); | ||
976 | |||
977 | return 1; | ||
978 | } | ||
979 | int handle_recv_end ( MSISession* session, MSIMessage* msg ) { | ||
980 | assert ( session ); | ||
981 | |||
982 | if ( has_call_error ( session, msg ) == 0 ) | ||
983 | return 0; | ||
984 | |||
985 | |||
986 | MSIMessage* _msg_ending = msi_new_message ( TYPE_RESPONSE, stringify_response ( ending ) ); | ||
987 | send_message ( session, _msg_ending, msg->friend_id ); | ||
988 | free_message ( _msg_ending ); | ||
989 | |||
990 | terminate_call ( session ); | ||
991 | |||
992 | event.rise ( callbacks[cb_onend], session ); | ||
993 | |||
994 | return 1; | ||
995 | } | ||
996 | |||
997 | /********** Response handlers **********/ | ||
998 | int handle_recv_ringing ( MSISession* session, MSIMessage* msg ) { | ||
999 | assert ( session ); | ||
1000 | |||
1001 | if ( has_call_error ( session, msg ) == 0 ) | ||
1002 | return 0; | ||
1003 | |||
1004 | session->call->ringing_timer_id = event.timer_alloc ( handle_timeout, session, session->call->ringing_tout_ms ); | ||
1005 | event.rise ( callbacks[cb_ringing], session ); | ||
1006 | |||
1007 | return 1; | ||
1008 | } | ||
1009 | int handle_recv_starting ( MSISession* session, MSIMessage* msg ) { | ||
1010 | assert ( session ); | ||
1011 | |||
1012 | if ( has_call_error ( session, msg ) == 0 ) | ||
1013 | return 0; | ||
1014 | |||
1015 | if ( !msg->cryptokey.header_value ) { | ||
1016 | return handle_error ( session, error_no_crypto_key, msg->friend_id ); | ||
1017 | } | ||
1018 | |||
1019 | /* Generate local key/nonce to send */ | ||
1020 | session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | ||
1021 | new_symmetric_key ( session->call->key_local ); | ||
1022 | |||
1023 | session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | ||
1024 | new_nonce ( session->call->nonce_local ); | ||
1025 | |||
1026 | /* Save peer key/nonce */ | ||
1027 | session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | ||
1028 | memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES ); | ||
1029 | |||
1030 | session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | ||
1031 | memcpy ( session->call->nonce_peer, msg->nonce.header_value, crypto_box_NONCEBYTES ); | ||
1032 | |||
1033 | session->call->state = call_active; | ||
1034 | |||
1035 | MSIMessage* _msg_start = msi_new_message ( TYPE_REQUEST, stringify_request ( start ) ); | ||
1036 | msi_msg_set_cryptokey ( _msg_start, session->call->key_local, crypto_secretbox_KEYBYTES ); | ||
1037 | msi_msg_set_nonce ( _msg_start, session->call->nonce_local, crypto_box_NONCEBYTES ); | ||
1038 | send_message ( session, _msg_start, msg->friend_id ); | ||
1039 | free_message ( _msg_start ); | ||
1040 | |||
1041 | flush_peer_type ( session, msg, 0 ); | ||
1042 | |||
1043 | event.rise ( callbacks[cb_starting], session ); | ||
1044 | event.timer_release ( session->call->ringing_timer_id ); | ||
1045 | |||
1046 | return 1; | ||
1047 | } | ||
1048 | int handle_recv_ending ( MSISession* session, MSIMessage* msg ) { | ||
1049 | assert ( session ); | ||
1050 | |||
1051 | if ( has_call_error ( session, msg ) == 0 ) | ||
1052 | return 0; | ||
1053 | |||
1054 | |||
1055 | terminate_call ( session ); | ||
1056 | |||
1057 | event.rise ( callbacks[cb_ending], session ); | ||
1058 | |||
1059 | return 1; | ||
1060 | } | ||
1061 | int handle_recv_error ( MSISession* session, MSIMessage* msg ) { | ||
1062 | assert ( session ); | ||
1063 | assert ( session->call ); | ||
1064 | |||
1065 | /* Handle error accordingly */ | ||
1066 | if ( msg->reason.header_value ) { | ||
1067 | session->last_error_id = atoi ( ( const char* ) msg->reason.header_value ); | ||
1068 | session->last_error_str = stringify_error ( session->last_error_id ); | ||
1069 | } | ||
1070 | |||
1071 | terminate_call ( session ); | ||
1072 | |||
1073 | event.rise ( callbacks[cb_ending], session ); | ||
1074 | |||
1075 | return 1; | ||
1076 | } | ||
1077 | |||
1078 | |||
1079 | /******************************************************************************************************************** | ||
1080 | * ******************************************************************************************************************* | ||
1081 | ******************************************************************************************************************** | ||
1082 | ******************************************************************************************************************** | ||
1083 | ******************************************************************************************************************** | ||
1084 | * | ||
1085 | * | ||
1086 | * | ||
1087 | * PUBLIC API FUNCTIONS IMPLEMENTATIONS | ||
1088 | * | ||
1089 | * | ||
1090 | * | ||
1091 | ******************************************************************************************************************** | ||
1092 | ******************************************************************************************************************** | ||
1093 | ******************************************************************************************************************** | ||
1094 | ******************************************************************************************************************** | ||
1095 | ********************************************************************************************************************/ | ||
1096 | |||
1097 | |||
1098 | |||
1099 | |||
1100 | |||
1101 | |||
1102 | |||
1103 | |||
1104 | /** | ||
1105 | * @brief Callback setter. | ||
1106 | * | ||
1107 | * @param callback The callback. | ||
1108 | * @param id The id. | ||
1109 | * @return void | ||
1110 | */ | ||
1111 | void msi_register_callback ( MSICallback callback, MSICallbackID id ) | ||
1112 | { | ||
1113 | callbacks[id] = callback; | ||
1114 | } | ||
1115 | |||
1116 | |||
1117 | /** | ||
1118 | * @brief Start the control session. | ||
1119 | * | ||
1120 | * @param messenger Tox* object. | ||
1121 | * @param user_agent User agent, i.e. 'Venom'; 'QT-gui' | ||
1122 | * @return MSISession* The created session. | ||
1123 | * @retval NULL Error occured. | ||
1124 | */ | ||
1125 | MSISession* msi_init_session ( Tox* messenger, const uint8_t* user_agent ) { | ||
1126 | assert ( messenger ); | ||
1127 | assert ( user_agent ); | ||
1128 | |||
1129 | MSISession* _retu = calloc ( sizeof ( MSISession ), 1 ); | ||
1130 | assert ( _retu ); | ||
1131 | |||
1132 | _retu->user_agent = user_agent; | ||
1133 | _retu->messenger_handle = messenger; | ||
1134 | _retu->agent_handler = NULL; | ||
1135 | |||
1136 | _retu->call = NULL; | ||
1137 | |||
1138 | _retu->frequ = 10000; /* default value? */ | ||
1139 | _retu->call_timeout = 30000; /* default value? */ | ||
1140 | |||
1141 | |||
1142 | m_callback_msi_packet((struct Messenger*) messenger, msi_handle_packet, _retu ); | ||
1143 | |||
1144 | |||
1145 | return _retu; | ||
1146 | } | ||
1147 | |||
1148 | |||
1149 | /** | ||
1150 | * @brief Terminate control session. | ||
1151 | * | ||
1152 | * @param session The session | ||
1153 | * @return int | ||
1154 | */ | ||
1155 | int msi_terminate_session ( MSISession* session ) { | ||
1156 | assert ( session ); | ||
1157 | |||
1158 | int _status = 0; | ||
1159 | |||
1160 | terminate_call ( session ); | ||
1161 | |||
1162 | /* TODO: Clean it up more? */ | ||
1163 | |||
1164 | free ( session ); | ||
1165 | return _status; | ||
1166 | } | ||
1167 | |||
1168 | |||
1169 | /** | ||
1170 | * @brief Send invite request to friend_id. | ||
1171 | * | ||
1172 | * @param session Control session. | ||
1173 | * @param call_type Type of the call. Audio or Video(both audio and video) | ||
1174 | * @param rngsec Ringing timeout. | ||
1175 | * @param friend_id The friend. | ||
1176 | * @return int | ||
1177 | */ | ||
1178 | int msi_invite ( MSISession* session, MSICallType call_type, uint32_t rngsec, uint32_t friend_id ) { | ||
1179 | assert ( session ); | ||
1180 | |||
1181 | MSIMessage* _msg_invite = msi_new_message ( TYPE_REQUEST, stringify_request ( invite ) ); | ||
1182 | |||
1183 | session->call = init_call ( session, 1, rngsec ); /* Just one for now */ | ||
1184 | t_randomstr ( session->call->id, CALL_ID_LEN ); | ||
1185 | |||
1186 | add_peer(session->call, friend_id ); | ||
1187 | |||
1188 | session->call->type_local = call_type; | ||
1189 | /* Do whatever with message */ | ||
1190 | |||
1191 | if ( call_type == type_audio ) { | ||
1192 | msi_msg_set_calltype | ||
1193 | ( _msg_invite, ( const uint8_t* ) CT_AUDIO_HEADER_VALUE, strlen ( CT_AUDIO_HEADER_VALUE ) ); | ||
1194 | } else { | ||
1195 | msi_msg_set_calltype | ||
1196 | ( _msg_invite, ( const uint8_t* ) CT_VIDEO_HEADER_VALUE, strlen ( CT_VIDEO_HEADER_VALUE ) ); | ||
1197 | } | ||
1198 | |||
1199 | send_message ( session, _msg_invite, friend_id ); | ||
1200 | free_message ( _msg_invite ); | ||
1201 | |||
1202 | session->call->state = call_inviting; | ||
1203 | |||
1204 | session->call->request_timer_id = event.timer_alloc ( handle_timeout, session, m_deftout ); | ||
1205 | |||
1206 | return 0; | ||
1207 | } | ||
1208 | |||
1209 | |||
1210 | /** | ||
1211 | * @brief Hangup active call. | ||
1212 | * | ||
1213 | * @param session Control session. | ||
1214 | * @return int | ||
1215 | * @retval -1 Error occured. | ||
1216 | * @retval 0 Success. | ||
1217 | */ | ||
1218 | int msi_hangup ( MSISession* session ) { | ||
1219 | assert ( session ); | ||
1220 | |||
1221 | if ( !session->call && session->call->state != call_active ) | ||
1222 | return -1; | ||
1223 | |||
1224 | MSIMessage* _msg_ending = msi_new_message ( TYPE_REQUEST, stringify_request ( end ) ); | ||
1225 | |||
1226 | /* hangup for each peer */ | ||
1227 | int _it = 0; | ||
1228 | for ( ; _it < session->call->peer_count; _it ++ ) | ||
1229 | send_message ( session, _msg_ending, session->call->peers[_it] ); | ||
1230 | |||
1231 | |||
1232 | free_message ( _msg_ending ); | ||
1233 | |||
1234 | session->call->request_timer_id = event.timer_alloc ( handle_timeout, session, m_deftout ); | ||
1235 | |||
1236 | return 0; | ||
1237 | } | ||
1238 | |||
1239 | |||
1240 | /** | ||
1241 | * @brief Answer active call request. | ||
1242 | * | ||
1243 | * @param session Control session. | ||
1244 | * @param call_type Answer with Audio or Video(both). | ||
1245 | * @return int | ||
1246 | */ | ||
1247 | int msi_answer ( MSISession* session, MSICallType call_type ) { | ||
1248 | assert ( session ); | ||
1249 | |||
1250 | MSIMessage* _msg_starting = msi_new_message ( TYPE_RESPONSE, stringify_response ( starting ) ); | ||
1251 | session->call->type_local = call_type; | ||
1252 | |||
1253 | if ( call_type == type_audio ) { | ||
1254 | msi_msg_set_calltype | ||
1255 | ( _msg_starting, ( const uint8_t* ) CT_AUDIO_HEADER_VALUE, strlen ( CT_AUDIO_HEADER_VALUE ) ); | ||
1256 | } else { | ||
1257 | msi_msg_set_calltype | ||
1258 | ( _msg_starting, ( const uint8_t* ) CT_VIDEO_HEADER_VALUE, strlen ( CT_VIDEO_HEADER_VALUE ) ); | ||
1259 | } | ||
1260 | |||
1261 | /* Now set the local encryption key and pass it with STARTING message */ | ||
1262 | |||
1263 | session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | ||
1264 | new_symmetric_key ( session->call->key_local ); | ||
1265 | |||
1266 | session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | ||
1267 | new_nonce ( session->call->nonce_local ); | ||
1268 | |||
1269 | msi_msg_set_cryptokey ( _msg_starting, session->call->key_local, crypto_secretbox_KEYBYTES ); | ||
1270 | msi_msg_set_nonce ( _msg_starting, session->call->nonce_local, crypto_box_NONCEBYTES ); | ||
1271 | |||
1272 | send_message ( session, _msg_starting, session->call->peers[session->call->peer_count - 1] ); | ||
1273 | free_message ( _msg_starting ); | ||
1274 | |||
1275 | session->call->state = call_active; | ||
1276 | |||
1277 | return 0; | ||
1278 | } | ||
1279 | |||
1280 | |||
1281 | /** | ||
1282 | * @brief Cancel request. | ||
1283 | * | ||
1284 | * @param session Control session. | ||
1285 | * @param friend_id The friend. | ||
1286 | * @return int | ||
1287 | */ | ||
1288 | int msi_cancel ( MSISession* session, int friend_id ) { | ||
1289 | assert ( session ); | ||
1290 | |||
1291 | MSIMessage* _msg_cancel = msi_new_message ( TYPE_REQUEST, stringify_request ( cancel ) ); | ||
1292 | send_message ( session, _msg_cancel, friend_id ); | ||
1293 | free_message ( _msg_cancel ); | ||
1294 | |||
1295 | terminate_call ( session ); | ||
1296 | |||
1297 | return 0; | ||
1298 | } | ||
1299 | |||
1300 | |||
1301 | /** | ||
1302 | * @brief Reject request. | ||
1303 | * | ||
1304 | * @param session Control session. | ||
1305 | * @return int | ||
1306 | */ | ||
1307 | int msi_reject ( MSISession* session ) { | ||
1308 | assert ( session ); | ||
1309 | |||
1310 | MSIMessage* _msg_reject = msi_new_message ( TYPE_REQUEST, stringify_request ( reject ) ); | ||
1311 | send_message ( session, _msg_reject, session->call->peers[session->call->peer_count - 1] ); | ||
1312 | free_message ( _msg_reject ); | ||
1313 | |||
1314 | session->call->request_timer_id = event.timer_alloc ( handle_timeout, session, m_deftout ); | ||
1315 | |||
1316 | return 0; | ||
1317 | } | ||
1318 | |||
1319 | |||
1320 | /** | ||
1321 | * @brief Terminate the current call. | ||
1322 | * | ||
1323 | * @param session Control session. | ||
1324 | * @return int | ||
1325 | */ | ||
1326 | int msi_stopcall ( MSISession* session ) { | ||
1327 | assert ( session ); | ||
1328 | |||
1329 | if ( !session->call ) | ||
1330 | return -1; | ||
1331 | |||
1332 | /* just terminate it */ | ||
1333 | |||
1334 | terminate_call ( session ); | ||
1335 | |||
1336 | return 0; | ||
1337 | } \ No newline at end of file | ||
diff --git a/toxav/toxmsi.h b/toxav/toxmsi.h new file mode 100755 index 00000000..c45662a6 --- /dev/null +++ b/toxav/toxmsi.h | |||
@@ -0,0 +1,231 @@ | |||
1 | /** toxmsi.h | ||
2 | * | ||
3 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | ||
7 | * Tox is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | ||
20 | * | ||
21 | * Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or | ||
22 | * my email: eniz_vukovic@hotmail.com | ||
23 | */ | ||
24 | |||
25 | #ifndef __TOXMSI | ||
26 | #define __TOXMSI | ||
27 | |||
28 | #include <inttypes.h> | ||
29 | #include "../toxcore/tox.h" | ||
30 | #include <pthread.h> | ||
31 | |||
32 | /* define size for call_id */ | ||
33 | #define CALL_ID_LEN 12 | ||
34 | |||
35 | |||
36 | typedef void* ( *MSICallback ) ( void* arg ); | ||
37 | |||
38 | |||
39 | /** | ||
40 | * @brief Call type identifier. Also used as rtp callback prefix. | ||
41 | */ | ||
42 | typedef enum { | ||
43 | type_audio = 70, | ||
44 | type_video, | ||
45 | } MSICallType; | ||
46 | |||
47 | |||
48 | /** | ||
49 | * @brief Call state identifiers. | ||
50 | */ | ||
51 | typedef enum { | ||
52 | call_inviting, /* when sending call invite */ | ||
53 | call_starting, /* when getting call invite */ | ||
54 | call_active, | ||
55 | call_hold | ||
56 | |||
57 | } MSICallState; | ||
58 | |||
59 | |||
60 | |||
61 | /** | ||
62 | * @brief The call struct. | ||
63 | * | ||
64 | */ | ||
65 | typedef struct _MSICall { /* Call info structure */ | ||
66 | MSICallState state; | ||
67 | |||
68 | MSICallType type_local; /* Type of payload user is ending */ | ||
69 | MSICallType* type_peer; /* Type of payload others are sending */ | ||
70 | |||
71 | uint8_t id[CALL_ID_LEN]; /* Random value identifying the call */ | ||
72 | |||
73 | uint8_t* key_local; /* The key for encryption */ | ||
74 | uint8_t* key_peer; /* The key for decryption */ | ||
75 | |||
76 | uint8_t* nonce_local; /* Local nonce */ | ||
77 | uint8_t* nonce_peer; /* Peer nonce */ | ||
78 | |||
79 | int ringing_tout_ms; /* Ringing timeout in ms */ | ||
80 | |||
81 | int request_timer_id; /* Timer id for outgoing request/action */ | ||
82 | int ringing_timer_id; /* Timer id for ringing timeout */ | ||
83 | |||
84 | pthread_mutex_t mutex; /* It's to be assumed that call will have | ||
85 | * seperate thread so add mutex | ||
86 | */ | ||
87 | uint32_t* peers; | ||
88 | uint16_t peer_count; | ||
89 | |||
90 | |||
91 | } MSICall; | ||
92 | |||
93 | |||
94 | /** | ||
95 | * @brief Control session struct | ||
96 | * | ||
97 | */ | ||
98 | typedef struct _MSISession { | ||
99 | |||
100 | /* Call handler */ | ||
101 | struct _MSICall* call; | ||
102 | |||
103 | int last_error_id; /* Determine the last error */ | ||
104 | const uint8_t* last_error_str; | ||
105 | |||
106 | const uint8_t* user_agent; | ||
107 | |||
108 | void* agent_handler; /* Pointer to an object that is handling msi */ | ||
109 | Tox* messenger_handle; | ||
110 | |||
111 | uint32_t frequ; | ||
112 | uint32_t call_timeout; /* Time of the timeout for some action to end; 0 if infinite */ | ||
113 | |||
114 | |||
115 | } MSISession; | ||
116 | |||
117 | |||
118 | /** | ||
119 | * @brief Callbacks ids that handle the states | ||
120 | */ | ||
121 | typedef enum { | ||
122 | /* Requests */ | ||
123 | cb_oninvite, | ||
124 | cb_onstart, | ||
125 | cb_oncancel, | ||
126 | cb_onreject, | ||
127 | cb_onend, | ||
128 | |||
129 | /* Responses */ | ||
130 | cb_ringing, | ||
131 | cb_starting, | ||
132 | cb_ending, | ||
133 | |||
134 | /* Protocol */ | ||
135 | cb_error, | ||
136 | cb_timeout, | ||
137 | |||
138 | } MSICallbackID; | ||
139 | |||
140 | |||
141 | /** | ||
142 | * @brief Callback setter. | ||
143 | * | ||
144 | * @param callback The callback. | ||
145 | * @param id The id. | ||
146 | * @return void | ||
147 | */ | ||
148 | void msi_register_callback(MSICallback callback, MSICallbackID id); | ||
149 | |||
150 | |||
151 | /** | ||
152 | * @brief Start the control session. | ||
153 | * | ||
154 | * @param messenger Tox* object. | ||
155 | * @param user_agent User agent, i.e. 'Venom'; 'QT-gui' | ||
156 | * @return MSISession* The created session. | ||
157 | * @retval NULL Error occured. | ||
158 | */ | ||
159 | MSISession* msi_init_session ( Tox* messenger, const uint8_t* user_agent ); | ||
160 | |||
161 | |||
162 | /** | ||
163 | * @brief Terminate control session. | ||
164 | * | ||
165 | * @param session The session | ||
166 | * @return int | ||
167 | */ | ||
168 | int msi_terminate_session ( MSISession* session ); | ||
169 | |||
170 | |||
171 | /** | ||
172 | * @brief Send invite request to friend_id. | ||
173 | * | ||
174 | * @param session Control session. | ||
175 | * @param call_type Type of the call. Audio or Video(both audio and video) | ||
176 | * @param rngsec Ringing timeout. | ||
177 | * @param friend_id The friend. | ||
178 | * @return int | ||
179 | */ | ||
180 | int msi_invite ( MSISession* session, MSICallType call_type, uint32_t rngsec, uint32_t friend_id ); | ||
181 | |||
182 | |||
183 | /** | ||
184 | * @brief Hangup active call. | ||
185 | * | ||
186 | * @param session Control session. | ||
187 | * @return int | ||
188 | * @retval -1 Error occured. | ||
189 | * @retval 0 Success. | ||
190 | */ | ||
191 | int msi_hangup ( MSISession* session ); | ||
192 | |||
193 | |||
194 | /** | ||
195 | * @brief Answer active call request. | ||
196 | * | ||
197 | * @param session Control session. | ||
198 | * @param call_type Answer with Audio or Video(both). | ||
199 | * @return int | ||
200 | */ | ||
201 | int msi_answer ( MSISession* session, MSICallType call_type ); | ||
202 | |||
203 | |||
204 | /** | ||
205 | * @brief Cancel request. | ||
206 | * | ||
207 | * @param session Control session. | ||
208 | * @param friend_id The friend. | ||
209 | * @return int | ||
210 | */ | ||
211 | int msi_cancel ( MSISession* session, int friend_id ); | ||
212 | |||
213 | |||
214 | /** | ||
215 | * @brief Reject request. | ||
216 | * | ||
217 | * @param session Control session. | ||
218 | * @return int | ||
219 | */ | ||
220 | int msi_reject ( MSISession* session ); | ||
221 | |||
222 | |||
223 | /** | ||
224 | * @brief Terminate the current call. | ||
225 | * | ||
226 | * @param session Control session. | ||
227 | * @return int | ||
228 | */ | ||
229 | int msi_stopcall ( MSISession* session ); | ||
230 | |||
231 | #endif /* __TOXMSI */ | ||
diff --git a/toxav/toxrtp.c b/toxav/toxrtp.c new file mode 100755 index 00000000..03d20363 --- /dev/null +++ b/toxav/toxrtp.c | |||
@@ -0,0 +1,876 @@ | |||
1 | /** toxrtp.c | ||
2 | * | ||
3 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | ||
7 | * Tox is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | ||
20 | * | ||
21 | * Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or | ||
22 | * my email: eniz_vukovic@hotmail.com | ||
23 | */ | ||
24 | |||
25 | #ifdef HAVE_CONFIG_H | ||
26 | #include "config.h" | ||
27 | #endif /* HAVE_CONFIG_H */ | ||
28 | |||
29 | #include "toxrtp.h" | ||
30 | #include <assert.h> | ||
31 | #include <limits.h> | ||
32 | #include <pthread.h> | ||
33 | |||
34 | #include "../toxcore/util.h" | ||
35 | #include "../toxcore/network.h" | ||
36 | #include "../toxcore/net_crypto.h" | ||
37 | #include "../toxcore/Messenger.h" | ||
38 | |||
39 | #define PAYLOAD_ID_VALUE_OPUS 1 | ||
40 | #define PAYLOAD_ID_VALUE_VP8 2 | ||
41 | |||
42 | #define size_32 4 | ||
43 | |||
44 | #define inline__ inline __attribute__((always_inline)) | ||
45 | |||
46 | |||
47 | #define ADD_FLAG_VERSION(_h, _v) do { ( _h->flags ) &= 0x3F; ( _h->flags ) |= ( ( ( _v ) << 6 ) & 0xC0 ); } while(0) | ||
48 | #define ADD_FLAG_PADDING(_h, _v) do { if ( _v > 0 ) _v = 1; ( _h->flags ) &= 0xDF; ( _h->flags ) |= ( ( ( _v ) << 5 ) & 0x20 ); } while(0) | ||
49 | #define ADD_FLAG_EXTENSION(_h, _v) do { if ( _v > 0 ) _v = 1; ( _h->flags ) &= 0xEF;( _h->flags ) |= ( ( ( _v ) << 4 ) & 0x10 ); } while(0) | ||
50 | #define ADD_FLAG_CSRCC(_h, _v) do { ( _h->flags ) &= 0xF0; ( _h->flags ) |= ( ( _v ) & 0x0F ); } while(0) | ||
51 | #define ADD_SETTING_MARKER(_h, _v) do { if ( _v > 1 ) _v = 1; ( _h->marker_payloadt ) &= 0x7F; ( _h->marker_payloadt ) |= ( ( ( _v ) << 7 ) /*& 0x80 */ ); } while(0) | ||
52 | #define ADD_SETTING_PAYLOAD(_h, _v) do { if ( _v > 127 ) _v = 127; ( _h->marker_payloadt ) &= 0x80; ( _h->marker_payloadt ) |= ( ( _v ) /* & 0x7F */ ); } while(0) | ||
53 | |||
54 | #define GET_FLAG_VERSION(_h) (( _h->flags & 0xd0 ) >> 6) | ||
55 | #define GET_FLAG_PADDING(_h) (( _h->flags & 0x20 ) >> 5) | ||
56 | #define GET_FLAG_EXTENSION(_h) (( _h->flags & 0x10 ) >> 4) | ||
57 | #define GET_FLAG_CSRCC(_h) ( _h->flags & 0x0f ) | ||
58 | #define GET_SETTING_MARKER(_h) (( _h->marker_payloadt ) >> 7) | ||
59 | #define GET_SETTING_PAYLOAD(_h) ((_h->marker_payloadt) & 0x7f) | ||
60 | |||
61 | |||
62 | |||
63 | /** | ||
64 | * @brief Checks if message came in late. | ||
65 | * | ||
66 | * @param session Control session. | ||
67 | * @param msg The message. | ||
68 | * @return int | ||
69 | * @retval -1 The message came in order. | ||
70 | * @retval 0 The message came late. | ||
71 | */ | ||
72 | inline__ int check_late_message (RTPSession* session, RTPMessage* msg) | ||
73 | { | ||
74 | /* | ||
75 | * Check Sequence number. If this new msg has lesser number then the session->rsequnum | ||
76 | * it shows that the message came in late. Also check timestamp to be 100% certain. | ||
77 | * | ||
78 | */ | ||
79 | return ( msg->header->sequnum < session->rsequnum && msg->header->timestamp < session->timestamp ) ? 0 : -1; | ||
80 | } | ||
81 | |||
82 | |||
83 | /** | ||
84 | * @brief Increases nonce value by 'target' | ||
85 | * | ||
86 | * @param nonce The nonce | ||
87 | * @param target The target | ||
88 | * @return void | ||
89 | */ | ||
90 | inline__ void increase_nonce(uint8_t* nonce, uint16_t target) | ||
91 | { | ||
92 | uint16_t _nonce_counter = ((uint16_t)( | ||
93 | (((uint16_t) nonce [crypto_box_NONCEBYTES - 1]) << 8 ) | | ||
94 | (((uint16_t) nonce [crypto_box_NONCEBYTES - 2]) ))); | ||
95 | |||
96 | /* Check overflow */ | ||
97 | if (_nonce_counter > USHRT_MAX - target ) { /* 2 bytes are not long enough */ | ||
98 | int _it = 3; | ||
99 | while ( _it <= crypto_box_NONCEBYTES ) _it += ++nonce[crypto_box_NONCEBYTES - _it] ? crypto_box_NONCEBYTES : 1; | ||
100 | |||
101 | _nonce_counter = _nonce_counter - (USHRT_MAX - target ); /* Assign the rest of it */ | ||
102 | } else { /* Increase nonce */ | ||
103 | |||
104 | _nonce_counter+= target; | ||
105 | } | ||
106 | |||
107 | /* Assign the 8 last bytes */ | ||
108 | |||
109 | nonce [crypto_box_NONCEBYTES - 1] = (uint8_t) (_nonce_counter >> 8); | ||
110 | nonce [crypto_box_NONCEBYTES - 2] = (uint8_t) (_nonce_counter); | ||
111 | } | ||
112 | |||
113 | |||
114 | /** | ||
115 | * @brief Speaks for it self. | ||
116 | * | ||
117 | */ | ||
118 | static const uint32_t payload_table[] = | ||
119 | { | ||
120 | 8000, 8000, 8000, 8000, 8000, 8000, 16000, 8000, 8000, 8000, /* 0-9 */ | ||
121 | 44100, 44100, 0, 0, 90000, 8000, 11025, 22050, 0, 0, /* 10-19 */ | ||
122 | 0, 0, 0, 0, 0, 90000, 90000, 0, 90000, 0, /* 20-29 */ | ||
123 | 0, 90000, 90000, 90000, 90000, 0, 0, 0, 0, 0, /* 30-39 */ | ||
124 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40-49 */ | ||
125 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 50-59 */ | ||
126 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60-69 */ | ||
127 | PAYLOAD_ID_VALUE_OPUS, PAYLOAD_ID_VALUE_VP8, 0, 0, 0, 0, 0, 0, 0, 0,/* 70-79 */ | ||
128 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80-89 */ | ||
129 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90-99 */ | ||
130 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 100-109 */ | ||
131 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 110-119 */ | ||
132 | 0, 0, 0, 0, 0, 0, 0, 0 /* 120-127 */ | ||
133 | }; | ||
134 | |||
135 | |||
136 | /** | ||
137 | * @brief Extracts header from payload. | ||
138 | * | ||
139 | * @param payload The payload. | ||
140 | * @param length The size of payload. | ||
141 | * @return RTPHeader* Extracted header. | ||
142 | * @retval NULL Error occurred while extracting header. | ||
143 | */ | ||
144 | RTPHeader* extract_header ( const uint8_t* payload, size_t length ) | ||
145 | { | ||
146 | if ( !payload ) { | ||
147 | return NULL; | ||
148 | } | ||
149 | |||
150 | const uint8_t* _it = payload; | ||
151 | |||
152 | RTPHeader* _retu = calloc(sizeof(RTPHeader), 1); | ||
153 | assert(_retu); | ||
154 | |||
155 | _retu->flags = *_it; ++_it; | ||
156 | |||
157 | /* This indicates if the first 2 bytes are valid. | ||
158 | * Now it my happen that this is out of order but | ||
159 | * it cuts down chances of parsing some invalid value | ||
160 | */ | ||
161 | if ( GET_FLAG_VERSION(_retu) != RTP_VERSION ){ | ||
162 | /* Deallocate */ | ||
163 | free(_retu); | ||
164 | return NULL; | ||
165 | } | ||
166 | |||
167 | /* | ||
168 | * Added a check for the size of the header little sooner so | ||
169 | * I don't need to parse the other stuff if it's bad | ||
170 | */ | ||
171 | uint8_t _cc = GET_FLAG_CSRCC ( _retu ); | ||
172 | uint32_t _length = 12 /* Minimum header len */ + ( _cc * 4 ); | ||
173 | |||
174 | if ( length < _length ) { | ||
175 | /* Deallocate */ | ||
176 | free(_retu); | ||
177 | return NULL; | ||
178 | } | ||
179 | |||
180 | if ( _cc > 0 ) { | ||
181 | _retu->csrc = calloc ( sizeof ( uint32_t ), _cc ); | ||
182 | assert(_retu->csrc); | ||
183 | |||
184 | } else { /* But this should not happen ever */ | ||
185 | /* Deallocate */ | ||
186 | free(_retu); | ||
187 | return NULL; | ||
188 | } | ||
189 | |||
190 | |||
191 | _retu->marker_payloadt = *_it; ++_it; | ||
192 | _retu->length = _length; | ||
193 | |||
194 | _retu->timestamp = ( ( uint32_t ) * _it << 24 ) | | ||
195 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
196 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
197 | ( * ( _it + 3 ) ) ; | ||
198 | |||
199 | _it += 4; | ||
200 | |||
201 | _retu->ssrc = ( ( uint32_t ) * _it << 24 ) | | ||
202 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
203 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
204 | ( ( uint32_t ) * ( _it + 3 ) ) ; | ||
205 | |||
206 | |||
207 | size_t _x; | ||
208 | for ( _x = 0; _x < _cc; _x++ ) { | ||
209 | _it += 4; | ||
210 | _retu->csrc[_x] = ( ( uint32_t ) * _it << 24 ) | | ||
211 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
212 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
213 | ( ( uint32_t ) * ( _it + 3 ) ) ; | ||
214 | } | ||
215 | |||
216 | return _retu; | ||
217 | } | ||
218 | |||
219 | /** | ||
220 | * @brief Extracts external header from payload. Must be called AFTER extract_header()! | ||
221 | * | ||
222 | * @param payload The ITERATED payload. | ||
223 | * @param length The size of payload. | ||
224 | * @return RTPExtHeader* Extracted extension header. | ||
225 | * @retval NULL Error occurred while extracting extension header. | ||
226 | */ | ||
227 | RTPExtHeader* extract_ext_header ( const uint8_t* payload, size_t length ) | ||
228 | { | ||
229 | const uint8_t* _it = payload; | ||
230 | |||
231 | RTPExtHeader* _retu = calloc(sizeof(RTPExtHeader), 1); | ||
232 | assert(_retu); | ||
233 | |||
234 | uint16_t _ext_length = ( ( uint16_t ) * _it << 8 ) | * ( _it + 1 ); _it += 2; | ||
235 | |||
236 | if ( length < ( _ext_length * sizeof(uint32_t) ) ) { | ||
237 | return NULL; | ||
238 | } | ||
239 | |||
240 | _retu->length = _ext_length; | ||
241 | _retu->type = ( ( uint16_t ) * _it << 8 ) | * ( _it + 1 ); _it -= 2; | ||
242 | |||
243 | _retu->table = calloc(sizeof(uint32_t), _ext_length ); | ||
244 | assert(_retu->table); | ||
245 | |||
246 | uint32_t* _table = _retu->table; | ||
247 | size_t _i; | ||
248 | for ( _i = 0; _i < _ext_length; _i++ ) { | ||
249 | _it += 4; | ||
250 | _table[_i] = ( ( uint32_t ) * _it << 24 ) | | ||
251 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
252 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
253 | ( ( uint32_t ) * ( _it + 3 ) ) ; | ||
254 | } | ||
255 | |||
256 | return _retu; | ||
257 | } | ||
258 | |||
259 | /** | ||
260 | * @brief Adds header to payload. Make sure _payload_ has enough space. | ||
261 | * | ||
262 | * @param header The header. | ||
263 | * @param payload The payload. | ||
264 | * @return uint8_t* Iterated position. | ||
265 | */ | ||
266 | uint8_t* add_header ( RTPHeader* header, uint8_t* payload ) | ||
267 | { | ||
268 | uint8_t _cc = GET_FLAG_CSRCC ( header ); | ||
269 | |||
270 | uint8_t* _it = payload; | ||
271 | |||
272 | |||
273 | /* Add sequence number first */ | ||
274 | *_it = ( header->sequnum >> 8 ); ++_it; | ||
275 | *_it = ( header->sequnum ); ++_it; | ||
276 | |||
277 | *_it = header->flags; ++_it; | ||
278 | *_it = header->marker_payloadt; ++_it; | ||
279 | |||
280 | |||
281 | uint32_t _timestamp = header->timestamp; | ||
282 | *_it = ( _timestamp >> 24 ); ++_it; | ||
283 | *_it = ( _timestamp >> 16 ); ++_it; | ||
284 | *_it = ( _timestamp >> 8 ); ++_it; | ||
285 | *_it = ( _timestamp ); ++_it; | ||
286 | |||
287 | uint32_t _ssrc = header->ssrc; | ||
288 | *_it = ( _ssrc >> 24 ); ++_it; | ||
289 | *_it = ( _ssrc >> 16 ); ++_it; | ||
290 | *_it = ( _ssrc >> 8 ); ++_it; | ||
291 | *_it = ( _ssrc ); | ||
292 | |||
293 | uint32_t *_csrc = header->csrc; | ||
294 | size_t _x; | ||
295 | for ( _x = 0; _x < _cc; _x++ ) { | ||
296 | ++_it; | ||
297 | *_it = ( _csrc[_x] >> 24 ); ++_it; | ||
298 | *_it = ( _csrc[_x] >> 16 ); ++_it; | ||
299 | *_it = ( _csrc[_x] >> 8 ); ++_it; | ||
300 | *_it = ( _csrc[_x] ); | ||
301 | } | ||
302 | |||
303 | return _it; | ||
304 | } | ||
305 | |||
306 | /** | ||
307 | * @brief Adds extension header to payload. Make sure _payload_ has enough space. | ||
308 | * | ||
309 | * @param header The header. | ||
310 | * @param payload The payload. | ||
311 | * @return uint8_t* Iterated position. | ||
312 | */ | ||
313 | uint8_t* add_ext_header ( RTPExtHeader* header, uint8_t* payload ) | ||
314 | { | ||
315 | uint8_t* _it = payload; | ||
316 | |||
317 | *_it = ( header->length >> 8 ); _it++; | ||
318 | *_it = ( header->length ); _it++; | ||
319 | |||
320 | *_it = ( header->type >> 8 ); ++_it; | ||
321 | *_it = ( header->type ); | ||
322 | |||
323 | size_t x; | ||
324 | |||
325 | uint32_t* _hd_ext = header->table; | ||
326 | for ( x = 0; x < header->length; x++ ) { | ||
327 | ++_it; | ||
328 | *_it = ( _hd_ext[x] >> 24 ); ++_it; | ||
329 | *_it = ( _hd_ext[x] >> 16 ); ++_it; | ||
330 | *_it = ( _hd_ext[x] >> 8 ); ++_it; | ||
331 | *_it = ( _hd_ext[x] ); | ||
332 | } | ||
333 | |||
334 | return _it; | ||
335 | } | ||
336 | |||
337 | /** | ||
338 | * @brief Builds header from control session values. | ||
339 | * | ||
340 | * @param session Control session. | ||
341 | * @return RTPHeader* Created header. | ||
342 | */ | ||
343 | RTPHeader* build_header ( RTPSession* session ) | ||
344 | { | ||
345 | RTPHeader* _retu; | ||
346 | _retu = calloc ( sizeof * _retu, 1 ); | ||
347 | assert(_retu); | ||
348 | |||
349 | ADD_FLAG_VERSION ( _retu, session->version ); | ||
350 | ADD_FLAG_PADDING ( _retu, session->padding ); | ||
351 | ADD_FLAG_EXTENSION ( _retu, session->extension ); | ||
352 | ADD_FLAG_CSRCC ( _retu, session->cc ); | ||
353 | ADD_SETTING_MARKER ( _retu, session->marker ); | ||
354 | ADD_SETTING_PAYLOAD ( _retu, session->payload_type ); | ||
355 | |||
356 | _retu->sequnum = session->sequnum; | ||
357 | _retu->timestamp = ((uint32_t)(current_time() / 1000)); /* micro to milli */ | ||
358 | _retu->ssrc = session->ssrc; | ||
359 | |||
360 | if ( session->cc > 0 ) { | ||
361 | _retu->csrc = calloc(sizeof(uint32_t), session->cc); | ||
362 | assert(_retu->csrc); | ||
363 | |||
364 | int i; | ||
365 | |||
366 | for ( i = 0; i < session->cc; i++ ) { | ||
367 | _retu->csrc[i] = session->csrc[i]; | ||
368 | } | ||
369 | } else { | ||
370 | _retu->csrc = NULL; | ||
371 | } | ||
372 | |||
373 | _retu->length = 12 /* Minimum header len */ + ( session->cc * size_32 ); | ||
374 | |||
375 | return _retu; | ||
376 | } | ||
377 | |||
378 | |||
379 | /** | ||
380 | * @brief Parses data into RTPMessage struct. Stores headers separately from the payload data | ||
381 | * and so the length variable is set accordingly. _sequnum_ argument is | ||
382 | * passed by the handle_packet() since it's parsed already. | ||
383 | * | ||
384 | * @param session Control session. | ||
385 | * @param sequnum Sequence number that's parsed from payload in handle_packet() | ||
386 | * @param data Payload data. | ||
387 | * @param length Payload size. | ||
388 | * @return RTPMessage* | ||
389 | * @retval NULL Error occurred. | ||
390 | */ | ||
391 | RTPMessage* msg_parse ( RTPSession* session, uint16_t sequnum, const uint8_t* data, uint32_t length ) | ||
392 | { | ||
393 | assert( length != -1); | ||
394 | |||
395 | RTPMessage* _retu = calloc(sizeof(RTPMessage), 1); | ||
396 | assert(_retu); | ||
397 | |||
398 | _retu->header = extract_header ( data, length ); /* It allocates memory and all */ | ||
399 | |||
400 | if ( !_retu->header ){ | ||
401 | free(_retu); | ||
402 | return NULL; | ||
403 | } | ||
404 | _retu->header->sequnum = sequnum; | ||
405 | |||
406 | _retu->length = length - _retu->header->length; | ||
407 | |||
408 | uint16_t _from_pos = _retu->header->length - 2 /* Since sequ num is excluded */ ; | ||
409 | |||
410 | |||
411 | if ( GET_FLAG_EXTENSION ( _retu->header ) ) { | ||
412 | _retu->ext_header = extract_ext_header ( data + _from_pos, length ); | ||
413 | if ( _retu->ext_header ){ | ||
414 | _retu->length -= ( 4 /* Minimum ext header len */ + _retu->ext_header->length * size_32 ); | ||
415 | _from_pos += ( 4 /* Minimum ext header len */ + _retu->ext_header->length * size_32 ); | ||
416 | } else { | ||
417 | free (_retu->ext_header); | ||
418 | free (_retu->header); | ||
419 | free (_retu); | ||
420 | return NULL; | ||
421 | } | ||
422 | } else { | ||
423 | _retu->ext_header = NULL; | ||
424 | } | ||
425 | |||
426 | /* Get the payload */ | ||
427 | _retu->data = calloc ( sizeof ( uint8_t ), _retu->length ); | ||
428 | assert(_retu->data); | ||
429 | |||
430 | memcpy ( _retu->data, data + _from_pos, length - _from_pos ); | ||
431 | |||
432 | _retu->next = NULL; | ||
433 | |||
434 | |||
435 | if ( session && check_late_message ( session, _retu) < 0 ){ | ||
436 | session->rsequnum = _retu->header->sequnum; | ||
437 | session->timestamp = _retu->header->timestamp; | ||
438 | } | ||
439 | |||
440 | return _retu; | ||
441 | } | ||
442 | |||
443 | /** | ||
444 | * @brief Callback for networking core. | ||
445 | * | ||
446 | * @param object RTPSession object. | ||
447 | * @param ip_port Where the message comes from. | ||
448 | * @param data Message data. | ||
449 | * @param length Message length. | ||
450 | * @return int | ||
451 | * @retval -1 Error occurred. | ||
452 | * @retval 0 Success. | ||
453 | */ | ||
454 | int rtp_handle_packet ( void* object, IP_Port ip_port, uint8_t* data, uint32_t length ) | ||
455 | { | ||
456 | RTPSession* _session = object; | ||
457 | RTPMessage* _msg; | ||
458 | |||
459 | if ( !_session ) | ||
460 | return -1; | ||
461 | |||
462 | uint8_t _plain[MAX_UDP_PACKET_SIZE]; | ||
463 | |||
464 | uint16_t _sequnum = ( ( uint16_t ) data[1] << 8 ) | data[2]; | ||
465 | |||
466 | /* Clculate the right nonce */ | ||
467 | uint8_t _calculated[crypto_box_NONCEBYTES]; | ||
468 | memcpy(_calculated, _session->decrypt_nonce, crypto_box_NONCEBYTES); | ||
469 | increase_nonce ( _calculated, _sequnum ); | ||
470 | |||
471 | /* Decrypt message */ | ||
472 | int _decrypted_length = decrypt_data_symmetric( | ||
473 | (uint8_t*)_session->decrypt_key, _calculated, data + 3, length - 3, _plain ); | ||
474 | |||
475 | /* This packet is either not encrypted properly or late | ||
476 | */ | ||
477 | if ( -1 == _decrypted_length ){ | ||
478 | |||
479 | /* If this is the case, then the packet is most likely late. | ||
480 | * Try with old nonce cycle. | ||
481 | */ | ||
482 | if ( _session->rsequnum < _sequnum ) { | ||
483 | _decrypted_length = decrypt_data_symmetric( | ||
484 | (uint8_t*)_session->decrypt_key, _session->nonce_cycle, data + 3, length - 3, _plain ); | ||
485 | |||
486 | if ( !_decrypted_length ) return -1; /* This packet is not encrypted properly */ | ||
487 | |||
488 | /* Otherwise, if decryption is ok with new cycle, set new cycle | ||
489 | */ | ||
490 | } else { | ||
491 | increase_nonce ( _calculated, MAX_SEQU_NUM ); | ||
492 | _decrypted_length = decrypt_data_symmetric( | ||
493 | (uint8_t*)_session->decrypt_key, _calculated, data + 3, length - 3, _plain ); | ||
494 | |||
495 | if ( !_decrypted_length ) return -1; /* This is just an error */ | ||
496 | |||
497 | /* A new cycle setting. */ | ||
498 | memcpy(_session->nonce_cycle, _session->decrypt_nonce, crypto_box_NONCEBYTES); | ||
499 | memcpy(_session->decrypt_nonce, _calculated, crypto_box_NONCEBYTES); | ||
500 | } | ||
501 | } | ||
502 | |||
503 | _msg = msg_parse ( NULL, _sequnum, _plain, _decrypted_length ); | ||
504 | |||
505 | if ( !_msg ) | ||
506 | return -1; | ||
507 | |||
508 | /* Hopefully this goes well | ||
509 | * NOTE: Is this even used? | ||
510 | */ | ||
511 | memcpy(&_msg->from, &ip_port, sizeof(tox_IP_Port)); | ||
512 | |||
513 | /* Check if message came in late */ | ||
514 | if ( check_late_message(_session, _msg) < 0 ) { /* Not late */ | ||
515 | _session->rsequnum = _msg->header->sequnum; | ||
516 | _session->timestamp = _msg->header->timestamp; | ||
517 | } | ||
518 | |||
519 | pthread_mutex_lock(&_session->mutex); | ||
520 | |||
521 | if ( _session->last_msg ) { | ||
522 | _session->last_msg->next = _msg; | ||
523 | _session->last_msg = _msg; | ||
524 | } else { | ||
525 | _session->last_msg = _session->oldest_msg = _msg; | ||
526 | } | ||
527 | |||
528 | pthread_mutex_unlock(&_session->mutex); | ||
529 | |||
530 | return 0; | ||
531 | } | ||
532 | |||
533 | |||
534 | |||
535 | /** | ||
536 | * @brief Stores headers and payload data in one container ( data ) | ||
537 | * and the length is set accordingly. Returned message is used for sending _only_. | ||
538 | * | ||
539 | * @param session The control session. | ||
540 | * @param data Payload data to send ( This is what you pass ). | ||
541 | * @param length Size of the payload data. | ||
542 | * @return RTPMessage* Created message. | ||
543 | * @retval NULL Error occurred. | ||
544 | */ | ||
545 | RTPMessage* rtp_new_message ( RTPSession* session, const uint8_t* data, uint32_t length ) | ||
546 | { | ||
547 | if ( !session ) | ||
548 | return NULL; | ||
549 | |||
550 | uint8_t* _from_pos; | ||
551 | RTPMessage* _retu = calloc(sizeof(RTPMessage), 1); | ||
552 | assert(_retu); | ||
553 | |||
554 | /* Sets header values and copies the extension header in _retu */ | ||
555 | _retu->header = build_header ( session ); /* It allocates memory and all */ | ||
556 | _retu->ext_header = session->ext_header; | ||
557 | |||
558 | |||
559 | uint32_t _total_length = length + _retu->header->length; | ||
560 | |||
561 | if ( _retu->ext_header ) { | ||
562 | _total_length += ( 4 /* Minimum ext header len */ + _retu->ext_header->length * size_32 ); | ||
563 | /* Allocate Memory for _retu->_data */ | ||
564 | _retu->data = calloc ( sizeof _retu->data, _total_length ); | ||
565 | assert(_retu->data); | ||
566 | |||
567 | _from_pos = add_header ( _retu->header, _retu->data ); | ||
568 | _from_pos = add_ext_header ( _retu->ext_header, _from_pos + 1 ); | ||
569 | } else { | ||
570 | /* Allocate Memory for _retu->_data */ | ||
571 | _retu->data = calloc ( sizeof _retu->data, _total_length ); | ||
572 | assert(_retu->data); | ||
573 | |||
574 | _from_pos = add_header ( _retu->header, _retu->data ); | ||
575 | } | ||
576 | |||
577 | /* | ||
578 | * Parses the extension header into the message | ||
579 | * Of course if any | ||
580 | */ | ||
581 | |||
582 | /* Appends _data on to _retu->_data */ | ||
583 | memcpy ( _from_pos + 1, data, length ); | ||
584 | |||
585 | _retu->length = _total_length; | ||
586 | |||
587 | _retu->next = NULL; | ||
588 | |||
589 | return _retu; | ||
590 | } | ||
591 | |||
592 | |||
593 | /******************************************************************************************************************** | ||
594 | ******************************************************************************************************************** | ||
595 | ******************************************************************************************************************** | ||
596 | ******************************************************************************************************************** | ||
597 | ******************************************************************************************************************** | ||
598 | * | ||
599 | * | ||
600 | * | ||
601 | * PUBLIC API FUNCTIONS IMPLEMENTATIONS | ||
602 | * | ||
603 | * | ||
604 | * | ||
605 | ******************************************************************************************************************** | ||
606 | ******************************************************************************************************************** | ||
607 | ******************************************************************************************************************** | ||
608 | ******************************************************************************************************************** | ||
609 | ********************************************************************************************************************/ | ||
610 | |||
611 | |||
612 | |||
613 | |||
614 | |||
615 | |||
616 | |||
617 | |||
618 | |||
619 | /** | ||
620 | * @brief Release all messages held by session. | ||
621 | * | ||
622 | * @param session The session. | ||
623 | * @return int | ||
624 | * @retval -1 Error occurred. | ||
625 | * @retval 0 Success. | ||
626 | */ | ||
627 | int rtp_release_session_recv ( RTPSession* session ) | ||
628 | { | ||
629 | if ( !session ){ | ||
630 | return -1; | ||
631 | } | ||
632 | |||
633 | RTPMessage* _tmp,* _it; | ||
634 | |||
635 | pthread_mutex_lock(&session->mutex); | ||
636 | |||
637 | for ( _it = session->oldest_msg; _it; _it = _tmp ){ | ||
638 | _tmp = _it->next; | ||
639 | rtp_free_msg( session, _it); | ||
640 | } | ||
641 | |||
642 | session->last_msg = session->oldest_msg = NULL; | ||
643 | |||
644 | pthread_mutex_unlock(&session->mutex); | ||
645 | |||
646 | return 0; | ||
647 | } | ||
648 | |||
649 | |||
650 | /** | ||
651 | * @brief Get's oldes message in the list. | ||
652 | * | ||
653 | * @param session Where the list is. | ||
654 | * @return RTPMessage* The message. You _must_ call rtp_msg_free() to free it. | ||
655 | * @retval NULL No messages in the list, or no list. | ||
656 | */ | ||
657 | RTPMessage* rtp_recv_msg ( RTPSession* session ) | ||
658 | { | ||
659 | if ( !session ) | ||
660 | return NULL; | ||
661 | |||
662 | RTPMessage* _retu = session->oldest_msg; | ||
663 | |||
664 | pthread_mutex_lock(&session->mutex); | ||
665 | |||
666 | if ( _retu ) | ||
667 | session->oldest_msg = _retu->next; | ||
668 | |||
669 | if ( !session->oldest_msg ) | ||
670 | session->last_msg = NULL; | ||
671 | |||
672 | pthread_mutex_unlock(&session->mutex); | ||
673 | |||
674 | return _retu; | ||
675 | } | ||
676 | |||
677 | |||
678 | /** | ||
679 | * @brief Sends data to _RTPSession::dest | ||
680 | * | ||
681 | * @param session The session. | ||
682 | * @param messenger Tox* object. | ||
683 | * @param data The payload. | ||
684 | * @param length Size of the payload. | ||
685 | * @return int | ||
686 | * @retval -1 On error. | ||
687 | * @retval 0 On success. | ||
688 | */ | ||
689 | int rtp_send_msg ( RTPSession* session, Tox* messenger, const uint8_t* data, uint16_t length ) | ||
690 | { | ||
691 | RTPMessage* msg = rtp_new_message (session, data, length); | ||
692 | |||
693 | if ( !msg ) return -1; | ||
694 | |||
695 | uint8_t _send_data [ MAX_UDP_PACKET_SIZE ]; | ||
696 | |||
697 | _send_data[0] = session->prefix; | ||
698 | |||
699 | /* Generate the right nonce */ | ||
700 | uint8_t _calculated[crypto_box_NONCEBYTES]; | ||
701 | memcpy(_calculated, session->encrypt_nonce, crypto_box_NONCEBYTES); | ||
702 | increase_nonce ( _calculated, msg->header->sequnum ); | ||
703 | |||
704 | /* Need to skip 2 bytes that are for sequnum */ | ||
705 | int encrypted_length = encrypt_data_symmetric( | ||
706 | (uint8_t*) session->encrypt_key, _calculated, msg->data + 2, msg->length - 2, _send_data + 3 ); | ||
707 | |||
708 | int full_length = encrypted_length + 3; | ||
709 | |||
710 | _send_data[1] = msg->data[0]; | ||
711 | _send_data[2] = msg->data[1]; | ||
712 | |||
713 | |||
714 | if ( full_length != sendpacket ( ((Messenger*)messenger)->net, *((IP_Port*) &session->dest), _send_data, full_length) ) { | ||
715 | printf("Rtp error: %s\n", strerror(errno)); | ||
716 | return -1; | ||
717 | } | ||
718 | |||
719 | |||
720 | /* Set sequ number */ | ||
721 | if ( session->sequnum >= MAX_SEQU_NUM ) { | ||
722 | session->sequnum = 0; | ||
723 | memcpy(session->encrypt_nonce, _calculated, crypto_box_NONCEBYTES); | ||
724 | } else { | ||
725 | session->sequnum++; | ||
726 | } | ||
727 | |||
728 | rtp_free_msg ( session, msg ); | ||
729 | return 0; | ||
730 | } | ||
731 | |||
732 | |||
733 | /** | ||
734 | * @brief Speaks for it self. | ||
735 | * | ||
736 | * @param session The control session msg belongs to. It can be NULL. | ||
737 | * @param msg The message. | ||
738 | * @return void | ||
739 | */ | ||
740 | void rtp_free_msg ( RTPSession* session, RTPMessage* msg ) | ||
741 | { | ||
742 | free ( msg->data ); | ||
743 | |||
744 | if ( !session ){ | ||
745 | free ( msg->header->csrc ); | ||
746 | if ( msg->ext_header ){ | ||
747 | free ( msg->ext_header->table ); | ||
748 | free ( msg->ext_header ); | ||
749 | } | ||
750 | } else { | ||
751 | if ( session->csrc != msg->header->csrc ) | ||
752 | free ( msg->header->csrc ); | ||
753 | if ( msg->ext_header && session->ext_header != msg->ext_header ) { | ||
754 | free ( msg->ext_header->table ); | ||
755 | free ( msg->ext_header ); | ||
756 | } | ||
757 | } | ||
758 | |||
759 | free ( msg->header ); | ||
760 | free ( msg ); | ||
761 | } | ||
762 | |||
763 | |||
764 | /** | ||
765 | * @brief Must be called before calling any other rtp function. It's used | ||
766 | * to initialize RTP control session. | ||
767 | * | ||
768 | * @param payload_type Type of payload used to send. You can use values in toxmsi.h::MSICallType | ||
769 | * @param messenger Tox* object. | ||
770 | * @param friend_num Friend id. | ||
771 | * @param encrypt_key Speaks for it self. | ||
772 | * @param decrypt_key Speaks for it self. | ||
773 | * @param encrypt_nonce Speaks for it self. | ||
774 | * @param decrypt_nonce Speaks for it self. | ||
775 | * @return RTPSession* Created control session. | ||
776 | * @retval NULL Error occurred. | ||
777 | */ | ||
778 | RTPSession* rtp_init_session ( int payload_type, | ||
779 | Tox* messenger, | ||
780 | int friend_num, | ||
781 | const uint8_t* encrypt_key, | ||
782 | const uint8_t* decrypt_key, | ||
783 | const uint8_t* encrypt_nonce, | ||
784 | const uint8_t* decrypt_nonce | ||
785 | ) | ||
786 | { | ||
787 | Messenger* _messenger_casted = (Messenger*) messenger; | ||
788 | |||
789 | IP_Port _dest = get_friend_ipport(_messenger_casted, friend_num ); | ||
790 | |||
791 | /* This should be enough eh? */ | ||
792 | if ( _dest.port == 0) { | ||
793 | return NULL; | ||
794 | } | ||
795 | |||
796 | RTPSession* _retu = calloc(sizeof(RTPSession), 1); | ||
797 | assert(_retu); | ||
798 | |||
799 | networking_registerhandler(_messenger_casted->net, payload_type, rtp_handle_packet, _retu); | ||
800 | |||
801 | _retu->version = RTP_VERSION; /* It's always 2 */ | ||
802 | _retu->padding = 0; /* If some additional data is needed about the packet */ | ||
803 | _retu->extension = 0; /* If extension to header is needed */ | ||
804 | _retu->cc = 1; /* Amount of contributors */ | ||
805 | _retu->csrc = NULL; /* Container */ | ||
806 | _retu->ssrc = randombytes_random(); | ||
807 | _retu->marker = 0; | ||
808 | _retu->payload_type = payload_table[payload_type]; | ||
809 | |||
810 | _retu->dest = *((tox_IP_Port*)&_dest); | ||
811 | |||
812 | _retu->rsequnum = _retu->sequnum = 1; | ||
813 | |||
814 | _retu->ext_header = NULL; /* When needed allocate */ | ||
815 | _retu->framerate = -1; | ||
816 | _retu->resolution = -1; | ||
817 | |||
818 | _retu->encrypt_key = encrypt_key; | ||
819 | _retu->decrypt_key = decrypt_key; | ||
820 | |||
821 | /* Need to allocate new memory */ | ||
822 | _retu->encrypt_nonce = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); assert(_retu->encrypt_nonce); | ||
823 | _retu->decrypt_nonce = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); assert(_retu->decrypt_nonce); | ||
824 | _retu->nonce_cycle = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); assert(_retu->nonce_cycle); | ||
825 | |||
826 | memcpy(_retu->encrypt_nonce, encrypt_nonce, crypto_box_NONCEBYTES); | ||
827 | memcpy(_retu->decrypt_nonce, decrypt_nonce, crypto_box_NONCEBYTES); | ||
828 | memcpy(_retu->nonce_cycle , decrypt_nonce, crypto_box_NONCEBYTES); | ||
829 | |||
830 | _retu->csrc = calloc(sizeof(uint32_t), 1); | ||
831 | assert(_retu->csrc); | ||
832 | |||
833 | _retu->csrc[0] = _retu->ssrc; /* Set my ssrc to the list receive */ | ||
834 | |||
835 | /* Also set payload type as prefix */ | ||
836 | _retu->prefix = payload_type; | ||
837 | |||
838 | _retu->oldest_msg = _retu->last_msg = NULL; | ||
839 | |||
840 | pthread_mutex_init(&_retu->mutex, NULL); | ||
841 | /* | ||
842 | * | ||
843 | */ | ||
844 | return _retu; | ||
845 | } | ||
846 | |||
847 | |||
848 | /** | ||
849 | * @brief Terminate the session. | ||
850 | * | ||
851 | * @param session The session. | ||
852 | * @param messenger The messenger who owns the session | ||
853 | * @return int | ||
854 | * @retval -1 Error occurred. | ||
855 | * @retval 0 Success. | ||
856 | */ | ||
857 | int rtp_terminate_session ( RTPSession* session, Tox* messenger ) | ||
858 | { | ||
859 | if ( !session ) | ||
860 | return -1; | ||
861 | |||
862 | networking_registerhandler(((Messenger*)messenger)->net, session->prefix, NULL, NULL); | ||
863 | |||
864 | free ( session->ext_header ); | ||
865 | free ( session->csrc ); | ||
866 | free ( session->decrypt_nonce ); | ||
867 | free ( session->encrypt_nonce ); | ||
868 | free ( session->nonce_cycle ); | ||
869 | |||
870 | pthread_mutex_destroy(&session->mutex); | ||
871 | |||
872 | /* And finally free session */ | ||
873 | free ( session ); | ||
874 | |||
875 | return 0; | ||
876 | } \ No newline at end of file | ||
diff --git a/toxav/toxrtp.h b/toxav/toxrtp.h new file mode 100755 index 00000000..32234ebe --- /dev/null +++ b/toxav/toxrtp.h | |||
@@ -0,0 +1,215 @@ | |||
1 | /** toxrtp.h | ||
2 | * | ||
3 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | ||
7 | * Tox is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | ||
20 | * | ||
21 | * Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or | ||
22 | * my email: eniz_vukovic@hotmail.com | ||
23 | */ | ||
24 | |||
25 | #ifndef __TOXRTP | ||
26 | #define __TOXRTP | ||
27 | |||
28 | #define RTP_VERSION 2 | ||
29 | #include <inttypes.h> | ||
30 | #include "../toxcore/tox.h" | ||
31 | |||
32 | #define MAX_SEQU_NUM 65535 | ||
33 | |||
34 | |||
35 | /** | ||
36 | * @brief Standard rtp header. | ||
37 | * | ||
38 | */ | ||
39 | |||
40 | typedef struct _RTPHeader { | ||
41 | uint8_t flags; /* Version(2),Padding(1), Ext(1), Cc(4) */ | ||
42 | uint8_t marker_payloadt; /* Marker(1), PlayLoad Type(7) */ | ||
43 | uint16_t sequnum; /* Sequence Number */ | ||
44 | uint32_t timestamp; /* Timestamp */ | ||
45 | uint32_t ssrc; /* SSRC */ | ||
46 | uint32_t* csrc; /* CSRC's table */ | ||
47 | uint32_t length; /* Length of the header in payload string. */ | ||
48 | |||
49 | } RTPHeader; | ||
50 | |||
51 | |||
52 | /** | ||
53 | * @brief Standard rtp extension header. | ||
54 | * | ||
55 | */ | ||
56 | typedef struct _RTPExtHeader { | ||
57 | uint16_t type; /* Extension profile */ | ||
58 | uint16_t length; /* Number of extensions */ | ||
59 | uint32_t* table; /* Extension's table */ | ||
60 | |||
61 | } RTPExtHeader; | ||
62 | |||
63 | |||
64 | /** | ||
65 | * @brief Standard rtp message. | ||
66 | * | ||
67 | */ | ||
68 | typedef struct _RTPMessage { | ||
69 | RTPHeader* header; | ||
70 | RTPExtHeader* ext_header; | ||
71 | |||
72 | uint8_t* data; | ||
73 | uint32_t length; | ||
74 | tox_IP_Port from; | ||
75 | |||
76 | struct _RTPMessage* next; | ||
77 | } RTPMessage; | ||
78 | |||
79 | |||
80 | /** | ||
81 | * @brief Our main session descriptor. | ||
82 | * It measures the session variables and controls | ||
83 | * the entire session. There are functions for manipulating | ||
84 | * the session so tend to use those instead of directly modifying | ||
85 | * session parameters. | ||
86 | * | ||
87 | */ | ||
88 | typedef struct _RTPSession { | ||
89 | uint8_t version; | ||
90 | uint8_t padding; | ||
91 | uint8_t extension; | ||
92 | uint8_t cc; | ||
93 | uint8_t marker; | ||
94 | uint8_t payload_type; | ||
95 | uint16_t sequnum; /* Set when sending */ | ||
96 | uint16_t rsequnum; /* Check when recving msg */ | ||
97 | uint32_t timestamp; | ||
98 | uint32_t ssrc; | ||
99 | uint32_t* csrc; | ||
100 | |||
101 | /* If some additional data must be sent via message | ||
102 | * apply it here. Only by allocating this member you will be | ||
103 | * automatically placing it within a message. | ||
104 | */ | ||
105 | RTPExtHeader* ext_header; | ||
106 | |||
107 | /* External header identifiers */ | ||
108 | int resolution; | ||
109 | int framerate; | ||
110 | |||
111 | |||
112 | /* Since these are only references of the | ||
113 | * call structure don't allocate or free | ||
114 | */ | ||
115 | |||
116 | const uint8_t* encrypt_key; | ||
117 | const uint8_t* decrypt_key; | ||
118 | uint8_t* encrypt_nonce; | ||
119 | uint8_t* decrypt_nonce; | ||
120 | |||
121 | uint8_t* nonce_cycle; | ||
122 | |||
123 | RTPMessage* oldest_msg; | ||
124 | RTPMessage* last_msg; /* tail */ | ||
125 | |||
126 | /* Msg prefix for core to know when recving */ | ||
127 | uint8_t prefix; | ||
128 | |||
129 | pthread_mutex_t mutex; | ||
130 | tox_IP_Port dest; | ||
131 | |||
132 | } RTPSession; | ||
133 | |||
134 | |||
135 | /** | ||
136 | * @brief Release all messages held by session. | ||
137 | * | ||
138 | * @param session The session. | ||
139 | * @return int | ||
140 | * @retval -1 Error occurred. | ||
141 | * @retval 0 Success. | ||
142 | */ | ||
143 | int rtp_release_session_recv ( RTPSession* session ); | ||
144 | |||
145 | |||
146 | /** | ||
147 | * @brief Get's oldest message in the list. | ||
148 | * | ||
149 | * @param session Where the list is. | ||
150 | * @return RTPMessage* The message. You need to call rtp_msg_free() to free it. | ||
151 | * @retval NULL No messages in the list, or no list. | ||
152 | */ | ||
153 | RTPMessage* rtp_recv_msg ( RTPSession* session ); | ||
154 | |||
155 | |||
156 | /** | ||
157 | * @brief Sends msg to _RTPSession::dest | ||
158 | * | ||
159 | * @param session The session. | ||
160 | * @param msg The message | ||
161 | * @param messenger Tox* object. | ||
162 | * @return int | ||
163 | * @retval -1 On error. | ||
164 | * @retval 0 On success. | ||
165 | */ | ||
166 | int rtp_send_msg ( RTPSession* session, Tox* messenger, const uint8_t* data, uint16_t length ); | ||
167 | |||
168 | |||
169 | /** | ||
170 | * @brief Speaks for it self. | ||
171 | * | ||
172 | * @param session The control session msg belongs to. It can be NULL. | ||
173 | * @param msg The message. | ||
174 | * @return void | ||
175 | */ | ||
176 | void rtp_free_msg ( RTPSession* session, RTPMessage* msg ); | ||
177 | |||
178 | |||
179 | /** | ||
180 | * @brief Must be called before calling any other rtp function. It's used | ||
181 | * to initialize RTP control session. | ||
182 | * | ||
183 | * @param payload_type Type of payload used to send. You can use values in toxmsi.h::MSICallType | ||
184 | * @param messenger Tox* object. | ||
185 | * @param friend_num Friend id. | ||
186 | * @param encrypt_key Speaks for it self. | ||
187 | * @param decrypt_key Speaks for it self. | ||
188 | * @param encrypt_nonce Speaks for it self. | ||
189 | * @param decrypt_nonce Speaks for it self. | ||
190 | * @return RTPSession* Created control session. | ||
191 | * @retval NULL Error occurred. | ||
192 | */ | ||
193 | RTPSession* rtp_init_session ( int payload_type, | ||
194 | Tox* messenger, | ||
195 | int friend_num, | ||
196 | const uint8_t* encrypt_key, | ||
197 | const uint8_t* decrypt_key, | ||
198 | const uint8_t* encrypt_nonce, | ||
199 | const uint8_t* decrypt_nonce ); | ||
200 | |||
201 | |||
202 | /** | ||
203 | * @brief Terminate the session. | ||
204 | * | ||
205 | * @param session The session. | ||
206 | * @param messenger The messenger who owns the session | ||
207 | * @return int | ||
208 | * @retval -1 Error occurred. | ||
209 | * @retval 0 Success. | ||
210 | */ | ||
211 | int rtp_terminate_session ( RTPSession* session, Tox* messenger ); | ||
212 | |||
213 | |||
214 | |||
215 | #endif /* __TOXRTP */ | ||
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc index 51b4c20b..c9e94911 100644 --- a/toxcore/Makefile.inc +++ b/toxcore/Makefile.inc | |||
@@ -29,6 +29,8 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \ | |||
29 | ../toxcore/group_chats.c \ | 29 | ../toxcore/group_chats.c \ |
30 | ../toxcore/assoc.h \ | 30 | ../toxcore/assoc.h \ |
31 | ../toxcore/assoc.c \ | 31 | ../toxcore/assoc.c \ |
32 | ../toxcore/event.h \ | ||
33 | ../toxcore/event.c \ | ||
32 | ../toxcore/onion.h \ | 34 | ../toxcore/onion.h \ |
33 | ../toxcore/onion.c \ | 35 | ../toxcore/onion.c \ |
34 | ../toxcore/onion_announce.h \ | 36 | ../toxcore/onion_announce.h \ |
@@ -40,7 +42,8 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \ | |||
40 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ | 42 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ |
41 | -I$(top_srcdir)/toxcore \ | 43 | -I$(top_srcdir)/toxcore \ |
42 | $(LIBSODIUM_CFLAGS) \ | 44 | $(LIBSODIUM_CFLAGS) \ |
43 | $(NACL_CFLAGS) | 45 | $(NACL_CFLAGS) \ |
46 | $(PTHREAD_CFLAGS) | ||
44 | 47 | ||
45 | libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \ | 48 | libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \ |
46 | $(EXTRA_LT_LDFLAGS) \ | 49 | $(EXTRA_LT_LDFLAGS) \ |
@@ -49,4 +52,5 @@ libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \ | |||
49 | $(WINSOCK2_LIBS) | 52 | $(WINSOCK2_LIBS) |
50 | 53 | ||
51 | libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) \ | 54 | libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) \ |
52 | $(NAC_LIBS) | 55 | $(NAC_LIBS) \ |
56 | $(PTHREAD_LIBS) | ||
diff --git a/toxcore/event.c b/toxcore/event.c new file mode 100755 index 00000000..17e68c87 --- /dev/null +++ b/toxcore/event.c | |||
@@ -0,0 +1,335 @@ | |||
1 | /** event.c | ||
2 | * | ||
3 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | ||
7 | * Tox is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | ||
20 | * | ||
21 | * Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or | ||
22 | * my email: eniz_vukovic@hotmail.com | ||
23 | */ | ||
24 | |||
25 | |||
26 | #ifdef HAVE_CONFIG_H | ||
27 | #include "config.h" | ||
28 | #endif /* HAVE_CONFIG_H */ | ||
29 | |||
30 | #include <stdlib.h> | ||
31 | #include "event.h" | ||
32 | |||
33 | #include "util.h" | ||
34 | |||
35 | #define _GNU_SOURCE | ||
36 | |||
37 | #include <assert.h> | ||
38 | #include <unistd.h> | ||
39 | #include <stddef.h> | ||
40 | #include <inttypes.h> | ||
41 | #include <pthread.h> | ||
42 | |||
43 | #define RUN_IN_THREAD(func, args) { pthread_t _tid; \ | ||
44 | pthread_create(&_tid, NULL, func, args); assert( pthread_detach(_tid) == 0 ); } | ||
45 | |||
46 | #define LOCK(event_handler) pthread_mutex_lock (&event_handler->mutex) | ||
47 | #define UNLOCK(event_handler) pthread_mutex_unlock(&event_handler->mutex) | ||
48 | |||
49 | #define FREQUENCY 10000 | ||
50 | |||
51 | #define inline__ inline __attribute__((always_inline)) | ||
52 | |||
53 | |||
54 | typedef struct _EventContainer { | ||
55 | void* (*func)(void*); | ||
56 | void* func_args; | ||
57 | unsigned timeout; | ||
58 | long long id; | ||
59 | |||
60 | } EventContainer; | ||
61 | |||
62 | typedef struct _EventHandler { | ||
63 | EventContainer* timed_events; | ||
64 | size_t timed_events_count; | ||
65 | |||
66 | int running; | ||
67 | |||
68 | pthread_mutex_t mutex; | ||
69 | |||
70 | } EventHandler; | ||
71 | |||
72 | int throw_event( void* (func)(void*), void* arg ); | ||
73 | int reset_timer_event ( int id, uint32_t timeout ); | ||
74 | int throw_timer_event ( void* (func)(void*), void* arg, unsigned timeout); | ||
75 | int cancel_timer_event ( int id ); | ||
76 | int execute_timer_event ( int id ); | ||
77 | |||
78 | struct _Event event = | ||
79 | { | ||
80 | throw_event, | ||
81 | /* reset_timer_event */ NULL, | ||
82 | throw_timer_event, | ||
83 | cancel_timer_event, | ||
84 | /*execute_timer_event*/ NULL | ||
85 | }; | ||
86 | |||
87 | /* | ||
88 | * Random functions used by this file | ||
89 | */ | ||
90 | void clear_events (EventContainer** event_container, size_t* counter) | ||
91 | { | ||
92 | free(*event_container ); | ||
93 | |||
94 | *event_container = NULL; | ||
95 | *counter = 0; | ||
96 | } | ||
97 | |||
98 | int pop_id ( EventContainer** event_container, size_t* counter, int id ) | ||
99 | { | ||
100 | if ( !*event_container || !*counter || !id ) | ||
101 | return -1; | ||
102 | |||
103 | EventContainer* _it = *event_container; | ||
104 | int i; | ||
105 | |||
106 | for ( i = *counter; i; -- i ){ | ||
107 | if ( _it->id == id ) { /* Hit! */ | ||
108 | break; | ||
109 | } | ||
110 | ++_it; | ||
111 | } | ||
112 | |||
113 | if ( i ) { | ||
114 | for ( ; i; -- i ){ *_it = *(_it + 1); ++_it; } | ||
115 | -- (*counter ); | ||
116 | *event_container = realloc(*event_container, sizeof(EventContainer) * (*counter )); /* resize */ | ||
117 | |||
118 | return 0; | ||
119 | |||
120 | } | ||
121 | |||
122 | /* not found here */ | ||
123 | |||
124 | return -1; | ||
125 | } | ||
126 | |||
127 | void push_event ( EventContainer** container, size_t* counter, void* (func)(void*), void* arg ) | ||
128 | { | ||
129 | (*container ) = realloc((*container ), sizeof(EventContainer) * ((*counter ) + 1)); | ||
130 | assert((*container ) != NULL); | ||
131 | |||
132 | (*container )[*counter].func = func; | ||
133 | (*container )[*counter].func_args = arg; | ||
134 | (*container )[*counter].timeout = 0; | ||
135 | (*container )[*counter].id = 0; | ||
136 | |||
137 | (*counter )++; | ||
138 | } | ||
139 | |||
140 | void reorder_events ( size_t counter, EventContainer* container, unsigned timeout ) | ||
141 | { | ||
142 | if ( counter > 1 ) { | ||
143 | |||
144 | int i = counter - 1; | ||
145 | |||
146 | /* start from behind excluding last added member */ | ||
147 | EventContainer* _it = &container[i - 1]; | ||
148 | |||
149 | EventContainer _last_added = container[i]; | ||
150 | |||
151 | for ( ; i; --i ) { | ||
152 | if ( _it->timeout > timeout ){ | ||
153 | *(_it + 1) = *_it; | ||
154 | *_it = _last_added; -- _it; | ||
155 | } | ||
156 | } | ||
157 | |||
158 | } | ||
159 | } | ||
160 | |||
161 | /* ============================================= */ | ||
162 | |||
163 | /* main poll for event execution */ | ||
164 | void* event_poll( void* arg ) | ||
165 | { | ||
166 | EventHandler* _event_handler = arg; | ||
167 | |||
168 | while ( _event_handler->running ) | ||
169 | { | ||
170 | |||
171 | LOCK( _event_handler ); | ||
172 | |||
173 | if ( _event_handler->timed_events ){ | ||
174 | |||
175 | uint32_t _time = ((uint32_t)(current_time() / 1000)); | ||
176 | |||
177 | if ( _event_handler->timed_events[0].timeout < _time ) { | ||
178 | |||
179 | RUN_IN_THREAD ( _event_handler->timed_events[0].func, | ||
180 | _event_handler->timed_events[0].func_args ); | ||
181 | |||
182 | pop_id(&_event_handler->timed_events, | ||
183 | &_event_handler->timed_events_count, | ||
184 | _event_handler->timed_events[0].id); | ||
185 | |||
186 | } | ||
187 | |||
188 | } | ||
189 | |||
190 | UNLOCK( _event_handler ); | ||
191 | |||
192 | usleep(FREQUENCY); | ||
193 | } | ||
194 | |||
195 | LOCK( _event_handler ); | ||
196 | |||
197 | clear_events(&_event_handler->timed_events, &_event_handler->timed_events_count); | ||
198 | |||
199 | UNLOCK( _event_handler ); | ||
200 | |||
201 | _event_handler->running = -1; | ||
202 | pthread_exit(NULL); | ||
203 | } | ||
204 | |||
205 | int throw_event( void* (func)(void*), void* arg ) | ||
206 | { | ||
207 | pthread_t _tid; | ||
208 | int _rc = | ||
209 | pthread_create(&_tid, NULL, func, arg ); | ||
210 | |||
211 | return (0 != _rc ) ? _rc : pthread_detach(_tid); | ||
212 | } | ||
213 | |||
214 | EventHandler event_handler; | ||
215 | |||
216 | /* Place and order array of timers */ | ||
217 | int throw_timer_event ( void* (func)(void*), void* arg, unsigned timeout) | ||
218 | { | ||
219 | static int _unique_id = 1; | ||
220 | |||
221 | push_event(&event_handler.timed_events, &(event_handler.timed_events_count), func, arg ); | ||
222 | |||
223 | size_t _counter = event_handler.timed_events_count; | ||
224 | |||
225 | event_handler.timed_events[_counter - 1].timeout = timeout + ((uint32_t)(current_time() / 1000)); | ||
226 | event_handler.timed_events[_counter - 1].id = _unique_id; ++_unique_id; | ||
227 | |||
228 | |||
229 | /* reorder */ | ||
230 | |||
231 | reorder_events(_counter, event_handler.timed_events, timeout ); | ||
232 | |||
233 | return _unique_id - 1; | ||
234 | } | ||
235 | |||
236 | int execute_timer_event ( int id ) | ||
237 | { | ||
238 | int _status; | ||
239 | |||
240 | LOCK((&event_handler)); | ||
241 | EventContainer* _it = event_handler.timed_events; | ||
242 | |||
243 | int _i = event_handler.timed_events_count; | ||
244 | |||
245 | /* Find it and execute */ | ||
246 | for ( ; _i; _i-- ) { | ||
247 | if ( _it->id == id ) { | ||
248 | RUN_IN_THREAD ( _it->func, _it->func_args ); | ||
249 | break; | ||
250 | } | ||
251 | ++_it; | ||
252 | } | ||
253 | |||
254 | /* Now remove it from the queue */ | ||
255 | |||
256 | if ( _i ) { | ||
257 | for ( ; _i; -- _i ){ *_it = *(_it + 1); ++_it; } | ||
258 | -- event_handler.timed_events_count; | ||
259 | |||
260 | event_handler.timed_events = realloc | ||
261 | (event_handler.timed_events, sizeof(EventContainer) * event_handler.timed_events_count); /* resize */ | ||
262 | |||
263 | _status = 0; | ||
264 | |||
265 | } | ||
266 | else _status = -1; | ||
267 | |||
268 | UNLOCK((&event_handler)); | ||
269 | |||
270 | return _status; | ||
271 | } | ||
272 | |||
273 | int reset_timer_event ( int id, uint32_t timeout ) | ||
274 | { | ||
275 | int _status; | ||
276 | |||
277 | LOCK((&event_handler)); | ||
278 | |||
279 | EventContainer* _it = event_handler.timed_events; | ||
280 | |||
281 | int _i = event_handler.timed_events_count; | ||
282 | |||
283 | /* Find it and change */ | ||
284 | for ( ; _i; _i-- ) { | ||
285 | if ( _it->id == id ) { | ||
286 | _it->timeout = timeout + ((uint32_t)(current_time() / 1000)); | ||
287 | break; | ||
288 | } | ||
289 | ++_it; | ||
290 | } | ||
291 | |||
292 | _status = _i ? -1 : 0; | ||
293 | |||
294 | UNLOCK((&event_handler)); | ||
295 | |||
296 | return _status; | ||
297 | } | ||
298 | |||
299 | /* Remove timer from array */ | ||
300 | inline__ int cancel_timer_event ( int id ) | ||
301 | { | ||
302 | return pop_id (&event_handler.timed_events, &event_handler.timed_events_count, id ); | ||
303 | } | ||
304 | |||
305 | |||
306 | /* Initialization and termination of event polls | ||
307 | * This will be run at the beginning and the end of the program execution. | ||
308 | * I think that's the best way to do it. | ||
309 | */ | ||
310 | |||
311 | void __attribute__((constructor)) init_event_poll () | ||
312 | { | ||
313 | event_handler.timed_events = NULL; | ||
314 | event_handler.timed_events_count = 0; | ||
315 | |||
316 | event_handler.running = 1; | ||
317 | |||
318 | pthread_mutex_init(&event_handler.mutex, NULL); | ||
319 | |||
320 | RUN_IN_THREAD(event_poll, &event_handler); | ||
321 | } | ||
322 | |||
323 | void __attribute__((destructor)) terminate_event_poll() | ||
324 | { | ||
325 | /* Exit thread */ | ||
326 | event_handler.running = 0; | ||
327 | |||
328 | /* Keep the global until thread exits */ | ||
329 | while (event_handler.running > -1) { | ||
330 | event_handler.running; | ||
331 | usleep(FREQUENCY*2); | ||
332 | } | ||
333 | |||
334 | pthread_mutex_destroy( &event_handler.mutex ); | ||
335 | } | ||
diff --git a/toxcore/event.h b/toxcore/event.h new file mode 100755 index 00000000..690cc1ca --- /dev/null +++ b/toxcore/event.h | |||
@@ -0,0 +1,51 @@ | |||
1 | /** event.h | ||
2 | * | ||
3 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
4 | * | ||
5 | * This file is part of Tox. | ||
6 | * | ||
7 | * Tox is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * Tox is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
19 | * | ||
20 | * | ||
21 | * Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or | ||
22 | * my email: eniz_vukovic@hotmail.com | ||
23 | */ | ||
24 | |||
25 | |||
26 | #ifndef __TOXEVENT | ||
27 | #define __TOXEVENT | ||
28 | |||
29 | |||
30 | /** | ||
31 | * - Events are, in fact, ran in their own threads upon execution. | ||
32 | * - Event handler is initialized at the start, before the main() function | ||
33 | * and terminated after it's execution. | ||
34 | * - Timers are checked for timeout every ~10000 ns. | ||
35 | * - Timers can be canceled or ran immediately via | ||
36 | * timer_release() or timer_now() functions. | ||
37 | * - Timeout is measured in milliseconds. | ||
38 | * | ||
39 | * NOTE: timer_reset () and timer_now() are not tested nor usable atm | ||
40 | * | ||
41 | */ | ||
42 | extern struct _Event | ||
43 | { | ||
44 | int (*rise) (void* ( func ) ( void* ), void* arg); | ||
45 | int (*timer_reset ) ( int id, unsigned timeout ); | ||
46 | int (*timer_alloc) (void* ( func ) ( void* ), void* arg, unsigned timeout); | ||
47 | int (*timer_release) (int id); | ||
48 | int (*timer_now) ( int id ); | ||
49 | } event; | ||
50 | |||
51 | #endif /* _MSI__EVENT_H_ */ | ||
diff --git a/toxmsi/Makefile.inc b/toxmsi/Makefile.inc deleted file mode 100644 index 7d620e70..00000000 --- a/toxmsi/Makefile.inc +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | if BUILD_AV | ||
2 | |||
3 | lib_LTLIBRARIES += libtoxmsi.la | ||
4 | |||
5 | libtoxmsi_la_include_HEADERS = \ | ||
6 | ../toxmsi/toxmsi.h \ | ||
7 | ../toxmsi/toxmedia.h | ||
8 | |||
9 | libtoxmsi_la_includedir = $(includedir)/tox | ||
10 | |||
11 | |||
12 | libtoxmsi_la_SOURCES = ../toxmsi/toxmsi.h \ | ||
13 | ../toxmsi/toxmsi.c \ | ||
14 | ../toxmsi/toxmsi_message.h \ | ||
15 | ../toxmsi/toxmsi_message.c \ | ||
16 | ../toxmsi/toxmsi_header.h \ | ||
17 | ../toxmsi/toxmsi_header.c \ | ||
18 | ../toxmsi/toxmsi_event.h \ | ||
19 | ../toxmsi/toxmsi_event.c \ | ||
20 | ../toxrtp/tests/test_helper.h \ | ||
21 | ../toxrtp/tests/test_helper.c | ||
22 | |||
23 | libtoxmsi_la_CFLAGS = -I../toxcore \ | ||
24 | -I../toxmsi \ | ||
25 | -I../toxrtp \ | ||
26 | $(NACL_CFLAGS) \ | ||
27 | $(PTHREAD_CFLAGS) | ||
28 | |||
29 | libtoxmsi_la_LDFLAGS = $(TOXMSI_LT_LDFLAGS) \ | ||
30 | $(EXTRA_LT_LDFLAGS) \ | ||
31 | $(NACL_LDFLAGS) \ | ||
32 | $(PTHREAD_LIBS) | ||
33 | |||
34 | libtoxmsi_la_LIBS = $(NACL_LIBS) | ||
35 | |||
36 | noinst_PROGRAMS += phone | ||
37 | |||
38 | phone_SOURCES = ../toxmsi/phone.c \ | ||
39 | ../toxmsi/toxmedia.c | ||
40 | |||
41 | phone_CFLAGS = -I../toxcore \ | ||
42 | -I../toxrtp \ | ||
43 | $(AVFORMAT_CFLAGS) \ | ||
44 | $(AVCODEC_CFLAGS) \ | ||
45 | $(AVUTIL_CFLAGS) \ | ||
46 | $(AVDEVICE_CFLAGS) \ | ||
47 | $(SWSCALE_CFLAGS) \ | ||
48 | $(SDL_CFLAGS) \ | ||
49 | $(OPENAL_CFLAGS) \ | ||
50 | $(NACL_CFLAGS) \ | ||
51 | $(OPUS_CFLAGS) \ | ||
52 | $(PTHREAD_CFLAGS) | ||
53 | |||
54 | |||
55 | phone_LDADD = $(PTHREAD_LIBS) \ | ||
56 | libtoxrtp.la \ | ||
57 | libtoxmsi.la \ | ||
58 | $(NACL_LDFLAGS) \ | ||
59 | $(AVFORMAT_LIBS) \ | ||
60 | $(AVCODEC_LIBS) \ | ||
61 | $(AVUTIL_LIBS) \ | ||
62 | $(AVDEVICE_LIBS) \ | ||
63 | $(SWSCALE_LIBS) \ | ||
64 | $(SDL_LIBS) \ | ||
65 | $(OPENAL_LIBS) \ | ||
66 | $(NACL_LIBS) \ | ||
67 | $(OPUS_LIBS) | ||
68 | |||
69 | endif | ||
diff --git a/toxmsi/phone.c b/toxmsi/phone.c deleted file mode 100644 index 432be94c..00000000 --- a/toxmsi/phone.c +++ /dev/null | |||
@@ -1,668 +0,0 @@ | |||
1 | #ifdef HAVE_CONFIG_H | ||
2 | #include "config.h" | ||
3 | #endif /* HAVE_CONFIG_H */ | ||
4 | |||
5 | #define _BSD_SOURCE | ||
6 | #define _GNU_SOURCE | ||
7 | |||
8 | #define _CT_PHONE | ||
9 | |||
10 | #ifdef _CT_PHONE | ||
11 | #include "phone.h" | ||
12 | #include <stdarg.h> | ||
13 | #include <unistd.h> | ||
14 | #include <stdio.h> | ||
15 | #include <string.h> | ||
16 | #include <stdlib.h> | ||
17 | /* #include <termios.h> Can this be removed? */ | ||
18 | #include <pthread.h> | ||
19 | #include "toxmedia.h" | ||
20 | |||
21 | |||
22 | |||
23 | void INFO (const char *_format, ...) | ||
24 | { | ||
25 | printf("\r[!] "); | ||
26 | va_list _arg; | ||
27 | va_start (_arg, _format); | ||
28 | vfprintf (stdout, _format, _arg); | ||
29 | va_end (_arg); | ||
30 | printf("\n\r >> "); | ||
31 | fflush(stdout); | ||
32 | } | ||
33 | |||
34 | int rtp_handlepacket ( void *_object, tox_IP_Port ip_port, uint8_t *data, uint32_t length ) | ||
35 | { | ||
36 | phone_t *_phone = _object; | ||
37 | rtp_msg_t *_msg; | ||
38 | uint8_t _payload_id; | ||
39 | |||
40 | if ( _phone->_msi->_call && _phone->_msi->_call->_state == call_active ) { | ||
41 | |||
42 | _msg = rtp_msg_parse ( NULL, data + 1, length - 1 ); /* ignore marker byte */ | ||
43 | |||
44 | if ( !_msg ) | ||
45 | return 0; | ||
46 | |||
47 | _payload_id = rtp_header_get_setting_payload_type(_msg->_header); | ||
48 | |||
49 | if ( _payload_id == _PAYLOAD_OPUS && _phone->_rtp_audio ) | ||
50 | rtp_store_msg(_phone->_rtp_audio, _msg); | ||
51 | else if ( _payload_id == _PAYLOAD_VP8 && _phone->_rtp_video ) | ||
52 | rtp_store_msg(_phone->_rtp_video, _msg); | ||
53 | else rtp_free_msg( NULL, _msg); | ||
54 | } | ||
55 | |||
56 | return SUCCESS; | ||
57 | } | ||
58 | int msi_handlepacket ( void *_object, tox_IP_Port ip_port, uint8_t *data, uint32_t length ) | ||
59 | { | ||
60 | msi_session_t *_session = _object; | ||
61 | msi_msg_t *_msg; | ||
62 | |||
63 | _msg = msi_parse_msg ( data + 1 ); /* ignore marker byte */ | ||
64 | |||
65 | if ( _msg ) { | ||
66 | /* my current solution for "hole punching" */ | ||
67 | _session->_friend_id = ip_port; | ||
68 | } else { | ||
69 | return FAILURE; | ||
70 | } | ||
71 | |||
72 | /* place message in a session */ | ||
73 | msi_store_msg(_session, _msg); | ||
74 | |||
75 | return SUCCESS; | ||
76 | } | ||
77 | |||
78 | void *phone_receivepacket ( void *_phone_p ) | ||
79 | { | ||
80 | phone_t *_phone = _phone_p; | ||
81 | |||
82 | |||
83 | networking_registerhandler(_phone->_networking, MSI_PACKET, msi_handlepacket, _phone->_msi); | ||
84 | networking_registerhandler(_phone->_networking, RTP_PACKET, rtp_handlepacket, _phone); | ||
85 | |||
86 | /* Now start main networking loop */ | ||
87 | while ( _phone->_networking ) { /* so not thread safe */ | ||
88 | networking_poll(_phone->_networking); | ||
89 | usleep(10000); | ||
90 | } | ||
91 | |||
92 | pthread_exit ( NULL ); | ||
93 | } | ||
94 | |||
95 | /* Media transport callback */ | ||
96 | typedef struct hmtc_args_s { | ||
97 | rtp_session_t **_rtp_audio; | ||
98 | rtp_session_t **_rtp_video; | ||
99 | call_type *_local_type_call; | ||
100 | call_state *_this_call; | ||
101 | void *_core_handler; | ||
102 | } hmtc_args_t; | ||
103 | |||
104 | void *phone_handle_media_transport_poll ( void *_hmtc_args_p ) | ||
105 | { | ||
106 | rtp_msg_t *_audio_msg, * _video_msg; | ||
107 | |||
108 | hmtc_args_t *_hmtc_args = _hmtc_args_p; | ||
109 | |||
110 | rtp_session_t *_rtp_audio = *_hmtc_args->_rtp_audio; | ||
111 | rtp_session_t *_rtp_video = *_hmtc_args->_rtp_video; | ||
112 | |||
113 | call_type *_type = _hmtc_args->_local_type_call; | ||
114 | void *_core_handler = _hmtc_args->_core_handler; | ||
115 | |||
116 | |||
117 | call_state *_this_call = _hmtc_args->_this_call; | ||
118 | |||
119 | while ( *_this_call == call_active ) { | ||
120 | |||
121 | // THREADLOCK() | ||
122 | |||
123 | _audio_msg = rtp_recv_msg ( _rtp_audio ); | ||
124 | _video_msg = rtp_recv_msg ( _rtp_video ); | ||
125 | |||
126 | if ( _audio_msg ) { | ||
127 | /* Do whatever with msg */ | ||
128 | puts("audio"); | ||
129 | /* Do whatever with msg | ||
130 | puts(_audio_msg->_data);*/ | ||
131 | rtp_free_msg ( _rtp_audio, _audio_msg ); | ||
132 | } | ||
133 | |||
134 | if ( _video_msg ) { | ||
135 | /* Do whatever with msg */ | ||
136 | puts("video"); | ||
137 | /* Do whatever with msg | ||
138 | puts(_video_msg->_data); */ | ||
139 | rtp_free_msg ( _rtp_video, _video_msg ); | ||
140 | _video_msg = NULL; | ||
141 | } | ||
142 | |||
143 | /* -------------------- */ | ||
144 | |||
145 | _audio_msg = rtp_msg_new ( _rtp_audio, (const uint8_t *)"audio\0", 6 ) ; | ||
146 | rtp_send_msg ( _rtp_audio, _audio_msg, _core_handler ); | ||
147 | _audio_msg = NULL; | ||
148 | |||
149 | if ( *_type == type_video ) { /* if local call send video */ | ||
150 | _video_msg = rtp_msg_new ( _rtp_video, (const uint8_t *)"video\0", 6 ) ; | ||
151 | rtp_send_msg ( _rtp_video, _video_msg, _core_handler ); | ||
152 | _video_msg = NULL; | ||
153 | } | ||
154 | |||
155 | //THREADUNLOCK() | ||
156 | |||
157 | usleep ( 10000 ); | ||
158 | /* -------------------- */ | ||
159 | } | ||
160 | |||
161 | //THREADLOCK() | ||
162 | |||
163 | if ( _audio_msg ) { | ||
164 | rtp_free_msg(_rtp_audio, _audio_msg); | ||
165 | } | ||
166 | |||
167 | if ( _video_msg ) { | ||
168 | rtp_free_msg(_rtp_video, _video_msg); | ||
169 | } | ||
170 | |||
171 | rtp_release_session_recv(_rtp_video); | ||
172 | rtp_release_session_recv(_rtp_audio); | ||
173 | |||
174 | rtp_terminate_session(_rtp_audio); | ||
175 | rtp_terminate_session(_rtp_video); | ||
176 | |||
177 | *_hmtc_args->_rtp_audio = NULL; | ||
178 | *_hmtc_args->_rtp_video = NULL; | ||
179 | |||
180 | free(_hmtc_args_p); | ||
181 | |||
182 | //THREADUNLOCK() | ||
183 | |||
184 | INFO("Media thread finished!"); | ||
185 | |||
186 | pthread_exit ( NULL ); | ||
187 | } | ||
188 | |||
189 | pthread_t phone_startmedia_loop ( phone_t *_phone ) | ||
190 | { | ||
191 | if ( !_phone ) { | ||
192 | return 0; | ||
193 | } | ||
194 | |||
195 | int _status; | ||
196 | |||
197 | uint8_t _prefix = RTP_PACKET; | ||
198 | |||
199 | pthread_t _rtp_tid; | ||
200 | int _rtp_thread_running = 1; | ||
201 | |||
202 | _phone->_rtp_audio = rtp_init_session ( -1, 1 ); | ||
203 | rtp_set_prefix ( _phone->_rtp_audio, &_prefix, 1 ); | ||
204 | rtp_add_receiver ( _phone->_rtp_audio, &_phone->_msi->_friend_id ); | ||
205 | rtp_set_payload_type(_phone->_rtp_audio, _PAYLOAD_OPUS); | ||
206 | |||
207 | _phone->_rtp_video = rtp_init_session ( -1, 1 ); | ||
208 | rtp_set_prefix ( _phone->_rtp_video, &_prefix, 1 ); | ||
209 | rtp_add_receiver ( _phone->_rtp_video, &_phone->_msi->_friend_id ); | ||
210 | rtp_set_payload_type(_phone->_rtp_video, _PAYLOAD_VP8); | ||
211 | |||
212 | |||
213 | |||
214 | hmtc_args_t *rtp_targs = calloc(sizeof(hmtc_args_t), 1); | ||
215 | |||
216 | |||
217 | rtp_targs->_rtp_audio = &_phone->_rtp_audio; | ||
218 | rtp_targs->_rtp_video = &_phone->_rtp_video; | ||
219 | rtp_targs->_local_type_call = &_phone->_msi->_call->_type_local; | ||
220 | rtp_targs->_this_call = &_phone->_msi->_call->_state; | ||
221 | rtp_targs->_core_handler = _phone->_networking; | ||
222 | |||
223 | codec_state *cs; | ||
224 | cs = _phone->cs; | ||
225 | //_status = pthread_create ( &_rtp_tid, NULL, phone_handle_media_transport_poll, rtp_targs ); | ||
226 | cs->_rtp_audio = _phone->_rtp_audio; | ||
227 | cs->_rtp_video = _phone->_rtp_video; | ||
228 | cs->_networking = _phone->_networking; | ||
229 | cs->socket = _phone->_tox_sock; | ||
230 | cs->quit = 0; | ||
231 | |||
232 | printf("support: %d %d\n", cs->support_send_audio, cs->support_send_video); | ||
233 | |||
234 | if (cs->support_send_audio && cs->support_send_video) /* quick fix */ | ||
235 | pthread_create(&_phone->cs->encode_audio_thread, NULL, encode_audio_thread, _phone->cs); | ||
236 | |||
237 | if (cs->support_receive_audio) | ||
238 | pthread_create(&_phone->cs->decode_audio_thread, NULL, decode_audio_thread, _phone->cs); | ||
239 | |||
240 | if (cs->support_send_video) | ||
241 | pthread_create(&_phone->cs->encode_video_thread, NULL, encode_video_thread, _phone->cs); | ||
242 | |||
243 | if (cs->support_receive_video) | ||
244 | pthread_create(&_phone->cs->decode_video_thread, NULL, decode_video_thread, _phone->cs); | ||
245 | |||
246 | // | ||
247 | return 1; | ||
248 | |||
249 | |||
250 | |||
251 | |||
252 | } | ||
253 | |||
254 | |||
255 | /* Some example callbacks */ | ||
256 | |||
257 | MCBTYPE callback_recv_invite ( MCBARGS ) | ||
258 | { | ||
259 | const char *_call_type; | ||
260 | |||
261 | msi_session_t *_msi = _arg; | ||
262 | |||
263 | /* Get the last one */ | ||
264 | call_type _type = _msi->_call->_type_peer[_msi->_call->_participants - 1]; | ||
265 | |||
266 | switch ( _type ) { | ||
267 | case type_audio: | ||
268 | _call_type = "audio"; | ||
269 | break; | ||
270 | |||
271 | case type_video: | ||
272 | _call_type = "video"; | ||
273 | break; | ||
274 | } | ||
275 | |||
276 | INFO( "Incoming %s call!", _call_type ); | ||
277 | |||
278 | } | ||
279 | MCBTYPE callback_recv_trying ( MCBARGS ) | ||
280 | { | ||
281 | INFO ( "Trying..."); | ||
282 | } | ||
283 | MCBTYPE callback_recv_ringing ( MCBARGS ) | ||
284 | { | ||
285 | INFO ( "Ringing!" ); | ||
286 | } | ||
287 | MCBTYPE callback_recv_starting ( MCBARGS ) | ||
288 | { | ||
289 | msi_session_t *_session = _arg; | ||
290 | |||
291 | if ( !phone_startmedia_loop(_session->_agent_handler) ) { | ||
292 | INFO("Starting call failed!"); | ||
293 | } else { | ||
294 | INFO ("Call started! ( press h to hangup )"); | ||
295 | } | ||
296 | } | ||
297 | MCBTYPE callback_recv_ending ( MCBARGS ) | ||
298 | { | ||
299 | msi_session_t *_session = _arg; | ||
300 | phone_t *_phone = _session->_agent_handler; | ||
301 | _phone->cs->quit = 1; | ||
302 | |||
303 | if (_phone->cs->encode_video_thread) | ||
304 | pthread_join(_phone->cs->encode_video_thread, NULL); | ||
305 | |||
306 | if (_phone->cs->encode_audio_thread) | ||
307 | pthread_join(_phone->cs->encode_audio_thread, NULL); | ||
308 | |||
309 | if (_phone->cs->decode_audio_thread) | ||
310 | pthread_join(_phone->cs->decode_audio_thread, NULL); | ||
311 | |||
312 | if (_phone->cs->decode_video_thread) | ||
313 | pthread_join(_phone->cs->decode_video_thread, NULL); | ||
314 | |||
315 | SDL_Quit(); | ||
316 | printf("all A/V threads successfully shut down\n"); | ||
317 | |||
318 | INFO ( "Call ended!" ); | ||
319 | } | ||
320 | |||
321 | MCBTYPE callback_recv_error ( MCBARGS ) | ||
322 | { | ||
323 | msi_session_t *_session = _arg; | ||
324 | |||
325 | INFO( "Error: %s", _session->_last_error_str ); | ||
326 | } | ||
327 | |||
328 | MCBTYPE callback_call_started ( MCBARGS ) | ||
329 | { | ||
330 | msi_session_t *_session = _arg; | ||
331 | |||
332 | if ( !phone_startmedia_loop(_session->_agent_handler) ) { | ||
333 | INFO("Starting call failed!"); | ||
334 | } else { | ||
335 | INFO ("Call started! ( press h to hangup )"); | ||
336 | } | ||
337 | |||
338 | } | ||
339 | MCBTYPE callback_call_canceled ( MCBARGS ) | ||
340 | { | ||
341 | INFO ( "Call canceled!" ); | ||
342 | } | ||
343 | MCBTYPE callback_call_rejected ( MCBARGS ) | ||
344 | { | ||
345 | INFO ( "Call rejected!\n" ); | ||
346 | } | ||
347 | MCBTYPE callback_call_ended ( MCBARGS ) | ||
348 | { | ||
349 | |||
350 | msi_session_t *_session = _arg; | ||
351 | phone_t *_phone = _session->_agent_handler; | ||
352 | _phone->cs->quit = 1; | ||
353 | |||
354 | if (_phone->cs->encode_video_thread) | ||
355 | pthread_join(_phone->cs->encode_video_thread, NULL); | ||
356 | |||
357 | if (_phone->cs->encode_audio_thread) | ||
358 | pthread_join(_phone->cs->encode_audio_thread, NULL); | ||
359 | |||
360 | if (_phone->cs->decode_audio_thread) | ||
361 | pthread_join(_phone->cs->decode_audio_thread, NULL); | ||
362 | |||
363 | if (_phone->cs->decode_video_thread) | ||
364 | pthread_join(_phone->cs->decode_video_thread, NULL); | ||
365 | |||
366 | SDL_Quit(); | ||
367 | printf("all A/V threads successfully shut down\n"); | ||
368 | |||
369 | INFO ( "Call ended!" ); | ||
370 | } | ||
371 | |||
372 | MCBTYPE callback_requ_timeout ( MCBARGS ) | ||
373 | { | ||
374 | INFO( "No answer! " ); | ||
375 | } | ||
376 | |||
377 | |||
378 | phone_t *initPhone(uint16_t _listen_port, uint16_t _send_port) | ||
379 | { | ||
380 | phone_t *_retu = calloc(sizeof(phone_t), 1); | ||
381 | _retu->cs = av_calloc(sizeof(codec_state), 1); | ||
382 | |||
383 | /* Initialize our mutex */ | ||
384 | pthread_mutex_init ( &_mutex, NULL ); | ||
385 | |||
386 | IP_Port _local; | ||
387 | ip_init(&_local.ip, 0); | ||
388 | _local.ip.ip4.uint32 = htonl ( INADDR_ANY ); | ||
389 | |||
390 | /* Bind local receive port to any address */ | ||
391 | _retu->_networking = new_networking ( _local.ip, _listen_port ); | ||
392 | |||
393 | if ( !_retu->_networking ) { | ||
394 | fprintf ( stderr, "new_networking() failed!\n" ); | ||
395 | return NULL; | ||
396 | } | ||
397 | |||
398 | _retu->_send_port = _send_port; | ||
399 | _retu->_recv_port = _listen_port; | ||
400 | |||
401 | _retu->_tox_sock = _retu->_networking->sock; | ||
402 | |||
403 | _retu->_rtp_audio = NULL; | ||
404 | _retu->_rtp_video = NULL; | ||
405 | |||
406 | |||
407 | /* Initialize msi */ | ||
408 | _retu->_msi = msi_init_session ( _retu->_networking, (const uint8_t *)_USERAGENT ); | ||
409 | |||
410 | if ( !_retu->_msi ) { | ||
411 | fprintf ( stderr, "msi_init_session() failed\n" ); | ||
412 | return NULL; | ||
413 | } | ||
414 | |||
415 | /* Initiate codecs */ | ||
416 | init_encoder(_retu->cs); | ||
417 | init_decoder(_retu->cs); | ||
418 | |||
419 | _retu->_msi->_agent_handler = _retu; | ||
420 | /* Initiate callbacks */ | ||
421 | msi_register_callback_send ( sendpacket ); /* Using core's send */ | ||
422 | |||
423 | msi_register_callback_call_started ( callback_call_started ); | ||
424 | msi_register_callback_call_canceled ( callback_call_canceled ); | ||
425 | msi_register_callback_call_rejected ( callback_call_rejected ); | ||
426 | msi_register_callback_call_ended ( callback_call_ended ); | ||
427 | |||
428 | msi_register_callback_recv_invite ( callback_recv_invite ); | ||
429 | msi_register_callback_recv_ringing ( callback_recv_ringing ); | ||
430 | msi_register_callback_recv_starting ( callback_recv_starting ); | ||
431 | msi_register_callback_recv_ending ( callback_recv_ending ); | ||
432 | msi_register_callback_recv_error(callback_recv_error); | ||
433 | |||
434 | msi_register_callback_requ_timeout ( callback_requ_timeout ); | ||
435 | /* ------------------ */ | ||
436 | |||
437 | /* Now start msi main loop. It's a must! | ||
438 | * Define a frequency in ms; 10 ms is just fine | ||
439 | */ | ||
440 | msi_start_main_loop ( _retu->_msi, 10 ); | ||
441 | |||
442 | return _retu; | ||
443 | } | ||
444 | |||
445 | pthread_t phone_startmain_loop(phone_t *_phone) | ||
446 | { | ||
447 | int _status; | ||
448 | /* Start receive thread */ | ||
449 | pthread_t _recv_thread, _phone_loop_thread; | ||
450 | _status = pthread_create ( &_recv_thread, NULL, phone_receivepacket, _phone ); | ||
451 | |||
452 | if ( _status < 0 ) { | ||
453 | printf ( "Error while starting handle call: %d, %s\n", errno, strerror ( errno ) ); | ||
454 | return 0; | ||
455 | } | ||
456 | |||
457 | _status = pthread_detach ( _recv_thread ); | ||
458 | |||
459 | if ( _status < 0 ) { | ||
460 | printf ( "Error while starting handle call: %d, %s\n", errno, strerror ( errno ) ); | ||
461 | return 0; | ||
462 | } | ||
463 | |||
464 | _status = pthread_create ( &_phone_loop_thread, NULL, phone_poll, _phone ); | ||
465 | |||
466 | if ( _status < 0 ) { | ||
467 | printf ( "Error while starting main phone loop: %d, %s\n", errno, strerror ( errno ) ); | ||
468 | return 0; | ||
469 | } | ||
470 | |||
471 | _status = pthread_join ( _phone_loop_thread, NULL ); | ||
472 | |||
473 | if ( _status < 0 ) { | ||
474 | printf ( "Error while starting main phone loop: %d, %s\n", errno, strerror ( errno ) ); | ||
475 | return 0; | ||
476 | } | ||
477 | |||
478 | return _phone_loop_thread; | ||
479 | } | ||
480 | |||
481 | void *phone_poll ( void *_p_phone ) | ||
482 | { | ||
483 | phone_t *_phone = _p_phone; | ||
484 | |||
485 | int _status = SUCCESS; | ||
486 | |||
487 | char _line[100]; | ||
488 | size_t _len; | ||
489 | |||
490 | |||
491 | char _dest[17]; /* For parsing destination ip */ | ||
492 | memset(_dest, '\0', 17); | ||
493 | |||
494 | INFO("Welcome to tox_phone version: " _USERAGENT "\n" | ||
495 | "Usage: \n" | ||
496 | "c [a/v] (type) [0.0.0.0] (dest ip) (calls dest ip)\n" | ||
497 | "h (if call is active hang up)\n" | ||
498 | "a [a/v] (answer incoming call: a - audio / v - audio + video (audio is default))\n" | ||
499 | "r (reject incoming call)\n" | ||
500 | "q (quit)\n" | ||
501 | "================================================================================" | ||
502 | ); | ||
503 | |||
504 | while ( 1 ) { | ||
505 | fgets(_line, sizeof(_line), stdin); | ||
506 | int i; | ||
507 | |||
508 | for (i = 0; i < 100; i++) { | ||
509 | if (_line[i] == '\n') { | ||
510 | _line[i] = '\0'; | ||
511 | } | ||
512 | } | ||
513 | |||
514 | _len = strlen(_line); | ||
515 | |||
516 | if ( !_len ) { | ||
517 | printf(" >> "); | ||
518 | fflush(stdout); | ||
519 | continue; | ||
520 | } | ||
521 | |||
522 | if ( _len > 1 && _line[1] != ' ' && _line[1] != '\n' ) { | ||
523 | INFO("Invalid input!"); | ||
524 | continue; | ||
525 | } | ||
526 | |||
527 | switch (_line[0]) { | ||
528 | |||
529 | case 'c': { | ||
530 | if ( _phone->_msi->_call ) { | ||
531 | INFO("Already in a call"); | ||
532 | break; | ||
533 | } | ||
534 | |||
535 | call_type _ctype; | ||
536 | |||
537 | if ( _len < 11 ) { | ||
538 | INFO("Invalid input; usage: c a/v 0.0.0.0"); | ||
539 | break; | ||
540 | } else if ( _line[2] == 'a' || _line[2] != 'v' ) { /* default and audio */ | ||
541 | _ctype = type_audio; | ||
542 | } else { /* video */ | ||
543 | _ctype = type_video; | ||
544 | } | ||
545 | |||
546 | strcpy(_dest, _line + 4 ); | ||
547 | _status = t_setipport(_dest, _phone->_send_port, &(_phone->_msi->_friend_id)); | ||
548 | |||
549 | if ( _status < 0 ) { | ||
550 | INFO("Could not resolve address!"); | ||
551 | } else { | ||
552 | /* Set timeout */ | ||
553 | msi_invite ( _phone->_msi, _ctype, 30 * 1000 ); | ||
554 | INFO("Calling!"); | ||
555 | } | ||
556 | |||
557 | t_memset((uint8_t *)_dest, '\0', 17); | ||
558 | |||
559 | } | ||
560 | break; | ||
561 | |||
562 | case 'h': { | ||
563 | if ( !_phone->_msi->_call ) { | ||
564 | break; | ||
565 | } | ||
566 | |||
567 | msi_hangup(_phone->_msi); | ||
568 | |||
569 | INFO("Hung up..."); | ||
570 | |||
571 | } | ||
572 | break; | ||
573 | |||
574 | case 'a': { | ||
575 | if ( _phone->_msi->_call && _phone->_msi->_call->_state != call_starting ) { | ||
576 | break; | ||
577 | } | ||
578 | |||
579 | if ( _len > 1 && _line[2] == 'v' ) | ||
580 | msi_answer(_phone->_msi, type_video); | ||
581 | else | ||
582 | msi_answer(_phone->_msi, type_audio); | ||
583 | |||
584 | } | ||
585 | break; | ||
586 | |||
587 | case 'r': { | ||
588 | if ( _phone->_msi->_call && _phone->_msi->_call->_state != call_starting ) { | ||
589 | break; | ||
590 | } | ||
591 | |||
592 | msi_reject(_phone->_msi); | ||
593 | |||
594 | INFO("Call Rejected..."); | ||
595 | |||
596 | } | ||
597 | break; | ||
598 | |||
599 | case 'q': { | ||
600 | INFO("Quitting!"); | ||
601 | pthread_exit(NULL); | ||
602 | } | ||
603 | |||
604 | default: { | ||
605 | INFO("Invalid command!"); | ||
606 | } | ||
607 | break; | ||
608 | |||
609 | } | ||
610 | |||
611 | usleep(1000); | ||
612 | } | ||
613 | |||
614 | pthread_exit(NULL); | ||
615 | } | ||
616 | |||
617 | int quitPhone(phone_t *_phone) | ||
618 | { | ||
619 | if ( _phone->_msi->_call ) { | ||
620 | msi_hangup(_phone->_msi); /* Hangup the phone first */ | ||
621 | } | ||
622 | |||
623 | msi_terminate_session(_phone->_msi); | ||
624 | pthread_mutex_destroy ( &_mutex ); | ||
625 | |||
626 | printf("\r[i] Quit!\n"); | ||
627 | return SUCCESS; | ||
628 | } | ||
629 | |||
630 | /* ---------------------- */ | ||
631 | |||
632 | int print_help ( const char *_name ) | ||
633 | { | ||
634 | printf ( "Usage: %s -m (mode) -r/s ( for setting the ports on test version )\n", _name ); | ||
635 | return FAILURE; | ||
636 | } | ||
637 | |||
638 | int main ( int argc, char *argv [] ) | ||
639 | { | ||
640 | arg_t *_args = parse_args ( argc, argv ); | ||
641 | |||
642 | const char *_mode = find_arg_duble ( _args, "-m" ); | ||
643 | uint16_t _listen_port; | ||
644 | uint16_t _send_port; | ||
645 | |||
646 | if ( !_mode ) | ||
647 | return print_help ( argv[0] ); | ||
648 | |||
649 | if ( _mode[0] == 'r' ) { | ||
650 | _send_port = 31000; | ||
651 | _listen_port = 31001; | ||
652 | } else if ( _mode[0] == 's' ) { | ||
653 | _send_port = 31001; | ||
654 | _listen_port = 31000; | ||
655 | } else return print_help ( argv[0] ); | ||
656 | |||
657 | phone_t *_phone = initPhone(_listen_port, _send_port); | ||
658 | |||
659 | if ( _phone ) { | ||
660 | phone_startmain_loop(_phone); | ||
661 | |||
662 | quitPhone(_phone); | ||
663 | } | ||
664 | |||
665 | return SUCCESS; | ||
666 | } | ||
667 | |||
668 | #endif /* _CT_PHONE */ | ||
diff --git a/toxmsi/phone.h b/toxmsi/phone.h deleted file mode 100644 index f96aac73..00000000 --- a/toxmsi/phone.h +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | #ifndef _PHONE_H_ | ||
2 | #define _PHONE_H_ | ||
3 | |||
4 | #include "toxmsi.h" | ||
5 | #include "../toxrtp/toxrtp.h" | ||
6 | #include "toxmsi_message.h" | ||
7 | #include "../toxrtp/toxrtp_message.h" | ||
8 | #include "../toxrtp/tests/test_helper.h" | ||
9 | #include <assert.h> | ||
10 | #include <pthread.h> | ||
11 | #include "toxmedia.h" | ||
12 | |||
13 | /* Define client version */ | ||
14 | #define _USERAGENT "tox_phone-v.0.2.1" | ||
15 | |||
16 | static pthread_mutex_t _mutex; | ||
17 | |||
18 | #define THREADLOCK() \ | ||
19 | pthread_mutex_lock ( &_mutex ); | ||
20 | |||
21 | #define THREADUNLOCK() \ | ||
22 | pthread_mutex_unlock ( &_mutex ); | ||
23 | |||
24 | typedef struct phone_s { | ||
25 | msi_session_t* _msi; | ||
26 | |||
27 | rtp_session_t* _rtp_audio; | ||
28 | rtp_session_t* _rtp_video; | ||
29 | |||
30 | uint32_t _frame_rate; | ||
31 | |||
32 | uint16_t _send_port, _recv_port; | ||
33 | |||
34 | int _tox_sock; | ||
35 | |||
36 | pthread_t _medialoop_id; | ||
37 | codec_state *cs; | ||
38 | |||
39 | Networking_Core* _networking; | ||
40 | } phone_t; | ||
41 | |||
42 | phone_t* initPhone(uint16_t _listen_port, uint16_t _send_port); | ||
43 | int quitPhone(phone_t* _phone); | ||
44 | |||
45 | /* My recv functions */ | ||
46 | int rtp_handlepacket ( void* _object, tox_IP_Port ip_port, uint8_t* data, uint32_t length ); | ||
47 | int msi_handlepacket ( void* _object, tox_IP_Port ip_port, uint8_t* data, uint32_t length ); | ||
48 | |||
49 | /* This is basically representation of networking_poll of toxcore */ | ||
50 | void* phone_receivepacket ( void* _phone ); | ||
51 | |||
52 | /* Phones main loop */ | ||
53 | void* phone_poll ( void* _phone ); | ||
54 | |||
55 | pthread_t phone_startmain_loop(phone_t* _phone); | ||
56 | pthread_t phone_startmedia_loop ( phone_t* _phone ); | ||
57 | |||
58 | /* Thread handlers */ | ||
59 | void* phone_handle_receive_callback ( void* _p ); | ||
60 | void* phone_handle_media_transport_poll ( void* _hmtc_args_p ); | ||
61 | |||
62 | #endif /* _PHONE_H_ */ | ||
diff --git a/toxmsi/toxmsi.c b/toxmsi/toxmsi.c deleted file mode 100644 index 38af28fb..00000000 --- a/toxmsi/toxmsi.c +++ /dev/null | |||
@@ -1,835 +0,0 @@ | |||
1 | |||
2 | #ifdef HAVE_CONFIG_H | ||
3 | #include "config.h" | ||
4 | #endif /* HAVE_CONFIG_H */ | ||
5 | |||
6 | #define _BSD_SOURCE | ||
7 | |||
8 | #include "toxmsi.h" | ||
9 | #include "toxmsi_event.h" | ||
10 | #include "toxmsi_message.h" | ||
11 | #include "../toxrtp/toxrtp_helper.h" | ||
12 | #include "../toxcore/network.h" | ||
13 | |||
14 | #include <assert.h> | ||
15 | #include <unistd.h> | ||
16 | #include <string.h> | ||
17 | |||
18 | #define same(x, y) strcmp((const char*) x, (const char*) y) == 0 | ||
19 | |||
20 | typedef enum { | ||
21 | error_deadcall = 1, /* has call id but it's from old call */ | ||
22 | error_id_mismatch, /* non-existing call */ | ||
23 | |||
24 | error_no_callid, /* not having call id */ | ||
25 | error_no_call, /* no call in session */ | ||
26 | |||
27 | error_busy | ||
28 | } msi_error_t; /* Error codes */ | ||
29 | |||
30 | static inline const uint8_t *stringify_error(msi_error_t _error_code) | ||
31 | { | ||
32 | static const uint8_t* strings[] = | ||
33 | { | ||
34 | (uint8_t*)"", | ||
35 | (uint8_t*)"Using dead call", | ||
36 | (uint8_t*)"Call id not set to any call", | ||
37 | (uint8_t*)"Call id not available", | ||
38 | (uint8_t*)"No active call in session", | ||
39 | (uint8_t*)"Callee busy" | ||
40 | }; | ||
41 | |||
42 | return strings[_error_code]; | ||
43 | } | ||
44 | |||
45 | static inline const uint8_t *stringify_error_code(msi_error_t _error_code) | ||
46 | { | ||
47 | static const uint8_t* strings[] = | ||
48 | { | ||
49 | (uint8_t*)"", | ||
50 | (uint8_t*)"1", | ||
51 | (uint8_t*)"2", | ||
52 | (uint8_t*)"3", | ||
53 | (uint8_t*)"4", | ||
54 | (uint8_t*)"5" | ||
55 | }; | ||
56 | |||
57 | return strings[_error_code]; | ||
58 | } | ||
59 | |||
60 | /* ******************* */ | ||
61 | /* --------- GLOBAL FUNCTIONS USED BY THIS FILE --------- */ | ||
62 | |||
63 | /* CALLBACKS */ | ||
64 | /*int (*msi_send_message_callback) ( int, uint8_t*, uint32_t ) = NULL;*/ | ||
65 | int ( *msi_send_message_callback ) ( void* _core_handler, tox_IP_Port, uint8_t*, uint32_t ) = NULL; | ||
66 | int ( *msi_recv_message_callback ) ( tox_IP_Port*, uint8_t*, uint32_t* ) = NULL; | ||
67 | |||
68 | MCBTYPE ( *msi_recv_invite_callback ) ( MCBARGS ) = NULL; | ||
69 | MCBTYPE ( *msi_start_call_callback ) ( MCBARGS ) = NULL; | ||
70 | MCBTYPE ( *msi_reject_call_callback ) ( MCBARGS ) = NULL; | ||
71 | MCBTYPE ( *msi_cancel_call_callback ) ( MCBARGS ) = NULL; | ||
72 | MCBTYPE ( *msi_end_call_callback ) ( MCBARGS ) = NULL; | ||
73 | |||
74 | MCBTYPE ( *msi_ringing_callback ) ( MCBARGS ) = NULL; | ||
75 | MCBTYPE ( *msi_starting_callback ) ( MCBARGS ) = NULL; | ||
76 | MCBTYPE ( *msi_ending_callback ) ( MCBARGS ) = NULL; | ||
77 | MCBTYPE ( *msi_error_callback ) ( MCBARGS ) = NULL; | ||
78 | |||
79 | MCBTYPE ( *msi_timeout_callback ) ( MCBARGS ) = NULL; | ||
80 | /* End of CALLBACKS */ | ||
81 | |||
82 | /*------------------------*/ | ||
83 | /*------------------------*/ | ||
84 | /*------------------------*/ | ||
85 | /*------------------------*/ | ||
86 | /*------------------------*/ | ||
87 | /*------------------------*/ | ||
88 | /*------------------------*/ | ||
89 | /*------------------------*/ | ||
90 | /*------------------------*/ | ||
91 | /*------------------------*/ | ||
92 | /*------------------------*/ | ||
93 | /*------------------------*/ | ||
94 | |||
95 | /* REGISTER CALLBACKS */ | ||
96 | /*void msi_register_callback_send(int (*callback) ( int, uint8_t*, uint32_t ) )*/ | ||
97 | void msi_register_callback_send ( int ( *callback ) ( void* _core_handler, tox_IP_Port, uint8_t*, uint32_t ) ) | ||
98 | { | ||
99 | msi_send_message_callback = callback; | ||
100 | } | ||
101 | |||
102 | void msi_register_callback_recv ( int ( *callback ) ( tox_IP_Port*, uint8_t*, uint32_t* ) ) | ||
103 | { | ||
104 | msi_recv_message_callback = callback; | ||
105 | } | ||
106 | |||
107 | /* Function to be called when received invite. | ||
108 | * This callback is all about what you do with it. | ||
109 | * Everything else is done internally. | ||
110 | */ | ||
111 | void msi_register_callback_recv_invite ( MCALLBACK ) | ||
112 | { | ||
113 | msi_recv_invite_callback = callback; | ||
114 | } | ||
115 | |||
116 | /* Function to be called when the call is started | ||
117 | * This callback is all about what you do with it. | ||
118 | * Everything else is done internally. | ||
119 | */ | ||
120 | void msi_register_callback_call_started ( MCALLBACK ) | ||
121 | { | ||
122 | msi_start_call_callback = callback; | ||
123 | } | ||
124 | |||
125 | /* Function to be called when call is rejected | ||
126 | * This callback is all about what you do with it. | ||
127 | * Everything else is done internally. | ||
128 | */ | ||
129 | void msi_register_callback_call_rejected ( MCALLBACK ) | ||
130 | { | ||
131 | msi_reject_call_callback = callback; | ||
132 | } | ||
133 | |||
134 | /* Function to be called when call is canceled | ||
135 | * This callback is all about what you do with it. | ||
136 | * Everything else is done internally. | ||
137 | */ | ||
138 | void msi_register_callback_call_canceled ( MCALLBACK ) | ||
139 | { | ||
140 | msi_cancel_call_callback = callback; | ||
141 | } | ||
142 | |||
143 | void msi_register_callback_call_ended ( MCALLBACK ) | ||
144 | { | ||
145 | msi_end_call_callback = callback; | ||
146 | } | ||
147 | |||
148 | |||
149 | /* Functions to be called when gotten x response */ | ||
150 | |||
151 | void msi_register_callback_recv_ringing ( MCALLBACK ) | ||
152 | { | ||
153 | msi_ringing_callback = callback; | ||
154 | } | ||
155 | void msi_register_callback_recv_starting ( MCALLBACK ) | ||
156 | { | ||
157 | msi_starting_callback = callback; | ||
158 | } | ||
159 | void msi_register_callback_recv_ending ( MCALLBACK ) | ||
160 | { | ||
161 | msi_ending_callback = callback; | ||
162 | } | ||
163 | |||
164 | void msi_register_callback_recv_error ( MCALLBACK ) | ||
165 | { | ||
166 | msi_error_callback = callback; | ||
167 | } | ||
168 | |||
169 | /* Timeout */ | ||
170 | void msi_register_callback_requ_timeout ( MCALLBACK ) | ||
171 | { | ||
172 | msi_timeout_callback = callback; | ||
173 | } | ||
174 | /* END REGISTERING */ | ||
175 | |||
176 | /*------------------------*/ | ||
177 | /*------------------------*/ | ||
178 | /*------------------------*/ | ||
179 | /*------------------------*/ | ||
180 | /*------------------------*/ | ||
181 | /*------------------------*/ | ||
182 | /*------------------------*/ | ||
183 | /*------------------------*/ | ||
184 | /*------------------------*/ | ||
185 | /*------------------------*/ | ||
186 | /*------------------------*/ | ||
187 | /*------------------------*/ | ||
188 | |||
189 | /* Function for receiving and parsing a message that will be used internally */ | ||
190 | |||
191 | msi_msg_t* receive_message ( msi_session_t* _session ) | ||
192 | { | ||
193 | assert(_session); | ||
194 | |||
195 | |||
196 | msi_msg_t* _retu = _session->_oldest_msg; | ||
197 | |||
198 | pthread_mutex_lock ( &_session->_mutex ); | ||
199 | |||
200 | if ( _retu ) | ||
201 | _session->_oldest_msg = _retu->_next; | ||
202 | |||
203 | if ( !_session->_oldest_msg ) | ||
204 | _session->_last_msg = NULL; | ||
205 | |||
206 | pthread_mutex_unlock ( &_session->_mutex ); | ||
207 | |||
208 | return _retu; | ||
209 | } | ||
210 | |||
211 | void msi_store_msg ( msi_session_t* _session, msi_msg_t* _msg ) | ||
212 | { | ||
213 | assert(_session); | ||
214 | assert(_msg); | ||
215 | |||
216 | pthread_mutex_lock ( &_session->_mutex ); | ||
217 | |||
218 | if ( _session->_last_msg ) { | ||
219 | _session->_last_msg->_next = _msg; | ||
220 | _session->_last_msg = _msg; | ||
221 | } else { | ||
222 | _session->_last_msg = _session->_oldest_msg = _msg; | ||
223 | } | ||
224 | |||
225 | pthread_mutex_unlock ( &_session->_mutex ); | ||
226 | } | ||
227 | |||
228 | int msi_send_msg ( msi_session_t* _session, msi_msg_t* _msg ) | ||
229 | { | ||
230 | int _status; | ||
231 | |||
232 | if ( !_session->_call ) /* Which should never happen */ | ||
233 | return FAILURE; | ||
234 | |||
235 | msi_msg_set_call_id ( _msg, _session->_call->_id ); | ||
236 | |||
237 | uint8_t _msg_string_final [MSI_MAXMSG_SIZE]; | ||
238 | t_memset ( _msg_string_final, '\0', MSI_MAXMSG_SIZE ); | ||
239 | |||
240 | _msg_string_final[0] = 69; | ||
241 | |||
242 | uint8_t* _msg_string = msi_msg_to_string ( _msg ); | ||
243 | |||
244 | size_t _lenght = t_memlen ( _msg_string ); | ||
245 | |||
246 | memcpy ( _msg_string_final + 1, _msg_string, _lenght ); | ||
247 | |||
248 | _lenght += 1; | ||
249 | |||
250 | _status = ( *msi_send_message_callback ) ( _session->_core_handler, _session->_friend_id, _msg_string_final, _lenght ); | ||
251 | |||
252 | free ( _msg_string ); | ||
253 | |||
254 | return _status; | ||
255 | } | ||
256 | |||
257 | /* Random stuff */ | ||
258 | void flush_peer_type ( msi_session_t* _session, msi_msg_t* _msg, int _peer_id ) | ||
259 | { | ||
260 | if ( _msg->_call_type ) { | ||
261 | if ( strcmp ( ( const char* ) _msg->_call_type->_header_value, CT_AUDIO_HEADER_VALUE ) == 0 ) { | ||
262 | _session->_call->_type_peer[_peer_id] = type_audio; | ||
263 | |||
264 | } else if ( strcmp ( ( const char* ) _msg->_call_type->_header_value, CT_VIDEO_HEADER_VALUE ) == 0 ) { | ||
265 | _session->_call->_type_peer[_peer_id] = type_video; | ||
266 | } else {} /* Error */ | ||
267 | } else {} /* Error */ | ||
268 | } | ||
269 | |||
270 | int has_call_error ( msi_session_t* _session, msi_msg_t* _msg ) | ||
271 | { | ||
272 | msi_msg_t* _msg_error = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _error ) ); | ||
273 | |||
274 | if ( !_msg->_call_id ) { | ||
275 | msi_msg_set_reason(_msg_error, stringify_error_code(error_no_callid) ); | ||
276 | |||
277 | } else if ( !_session->_call ) { | ||
278 | msi_msg_set_reason(_msg_error, stringify_error_code(error_no_call) ); | ||
279 | |||
280 | } else if ( strcmp((const char*)_session->_call->_id, (const char*)_msg->_call_id->_header_value ) != 0 ) { | ||
281 | msi_msg_set_reason(_msg_error, stringify_error_code(error_id_mismatch) ); | ||
282 | } | ||
283 | |||
284 | if ( _msg_error->_reason ) { | ||
285 | msi_send_msg ( _session, _msg_error ); | ||
286 | msi_free_msg ( _msg_error ); | ||
287 | return SUCCESS; | ||
288 | } | ||
289 | |||
290 | msi_free_msg ( _msg_error ); | ||
291 | return FAILURE; | ||
292 | } | ||
293 | |||
294 | /* --------- END OF GLOBAL FUNCTIONS USED BY THIS FILE --------- */ | ||
295 | |||
296 | /*------------------------*/ | ||
297 | /*------------------------*/ | ||
298 | /*------------------------*/ | ||
299 | /*------------------------*/ | ||
300 | /*------------------------*/ | ||
301 | /*------------------------*/ | ||
302 | /*------------------------*/ | ||
303 | /*------------------------*/ | ||
304 | /*------------------------*/ | ||
305 | /*------------------------*/ | ||
306 | /*------------------------*/ | ||
307 | /*------------------------*/ | ||
308 | |||
309 | msi_session_t* msi_init_session ( void* _core_handler, const uint8_t* _user_agent ) | ||
310 | { | ||
311 | assert(_core_handler); | ||
312 | assert(_user_agent); | ||
313 | |||
314 | msi_session_t* _session = calloc ( sizeof ( msi_session_t ), 1 ); | ||
315 | assert(_session); | ||
316 | |||
317 | _session->_oldest_msg = _session->_last_msg = NULL; | ||
318 | _session->_core_handler = _core_handler; | ||
319 | |||
320 | _session->_user_agent = t_strallcpy ( _user_agent ); | ||
321 | _session->_agent_handler = NULL; | ||
322 | |||
323 | _session->_key = 0; | ||
324 | _session->_call = NULL; | ||
325 | |||
326 | _session->_frequ = 10000; /* default value? */ | ||
327 | _session->_call_timeout = 30000; /* default value? */ | ||
328 | |||
329 | /* Use the same frequency */ | ||
330 | _session->_event_handler = init_event_poll ( _session->_frequ ); | ||
331 | |||
332 | pthread_mutex_init ( &_session->_mutex, NULL ); | ||
333 | |||
334 | return _session; | ||
335 | } | ||
336 | |||
337 | int msi_terminate_session ( msi_session_t* _session ) | ||
338 | { | ||
339 | assert(_session); | ||
340 | |||
341 | int _status = 0; | ||
342 | |||
343 | terminate_event_poll ( _session->_event_handler ); | ||
344 | free ( _session ); | ||
345 | /* TODO: terminate the rest of the session */ | ||
346 | |||
347 | pthread_mutex_destroy ( &_session->_mutex ); | ||
348 | |||
349 | return _status; | ||
350 | } | ||
351 | |||
352 | msi_call_t* msi_init_call ( msi_session_t* _session, int _peers, uint32_t _timeoutms ) | ||
353 | { | ||
354 | assert(_session); | ||
355 | assert(_peers); | ||
356 | |||
357 | msi_call_t* _call = calloc ( sizeof ( msi_call_t ), 1 ); | ||
358 | _call->_type_peer = calloc ( sizeof ( call_type ), _peers ); | ||
359 | |||
360 | assert(_call); | ||
361 | assert(_call->_type_peer); | ||
362 | |||
363 | _call->_participants = _peers; | ||
364 | _call->_key = _session->_key; | ||
365 | _call->_timeoutst = _timeoutms; | ||
366 | _call->_outgoing_timer_id = 0; | ||
367 | |||
368 | return _call; | ||
369 | } | ||
370 | |||
371 | int msi_terminate_call ( msi_session_t* _session ) | ||
372 | { | ||
373 | assert(_session); | ||
374 | |||
375 | if ( _session->_call->_type_peer ) | ||
376 | free ( _session->_call->_type_peer ); | ||
377 | |||
378 | cancel_timer_event(_session->_event_handler, _session->_call->_outgoing_timer_id); | ||
379 | |||
380 | free ( _session->_call ); | ||
381 | |||
382 | _session->_call = NULL; | ||
383 | |||
384 | return SUCCESS; | ||
385 | } | ||
386 | /*------------------------*/ | ||
387 | /*------------------------*/ | ||
388 | /*------------------------*/ | ||
389 | /*------------------------*/ | ||
390 | /*------------------------*/ | ||
391 | /*------------------------*/ | ||
392 | /*------------------------*/ | ||
393 | /*------------------------*/ | ||
394 | /*------------------------*/ | ||
395 | /*------------------------*/ | ||
396 | /*------------------------*/ | ||
397 | /*------------------------*/ | ||
398 | |||
399 | /* STATE HANDLERS */ | ||
400 | |||
401 | /* REQUESTS */ | ||
402 | int msi_handle_recv_invite ( msi_session_t* _session, msi_msg_t* _msg ) | ||
403 | { | ||
404 | assert(_session); | ||
405 | |||
406 | if ( _session->_call ) { | ||
407 | msi_msg_t* _msg_error = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _error ) ); | ||
408 | msi_msg_set_reason(_msg_error, stringify_error_code(error_busy)); | ||
409 | msi_send_msg(_session, _msg_error); | ||
410 | msi_free_msg(_msg_error); | ||
411 | |||
412 | return 0; | ||
413 | } | ||
414 | if ( !_msg->_call_id ) { | ||
415 | msi_msg_t* _msg_error = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _error ) ); | ||
416 | msi_msg_set_reason(_msg_error, stringify_error_code(error_no_callid)); | ||
417 | msi_send_msg(_session, _msg_error); | ||
418 | msi_free_msg(_msg_error); | ||
419 | return 0; | ||
420 | } | ||
421 | |||
422 | _session->_call = msi_init_call ( _session, 1, _session->_call_timeout ); | ||
423 | t_memcpy(_session->_call->_id, _msg->_call_id->_header_value, _CALL_ID_LEN); | ||
424 | _session->_call->_state = call_starting; | ||
425 | |||
426 | flush_peer_type ( _session, _msg, 0 ); | ||
427 | |||
428 | msi_msg_t* _msg_ringing = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _ringing ) ); | ||
429 | msi_send_msg ( _session, _msg_ringing ); | ||
430 | msi_free_msg ( _msg_ringing ); | ||
431 | |||
432 | throw_event ( _session->_event_handler, msi_recv_invite_callback, _session ); | ||
433 | return 1; | ||
434 | } | ||
435 | int msi_handle_recv_start ( msi_session_t* _session, msi_msg_t* _msg ) | ||
436 | { | ||
437 | assert(_session); | ||
438 | |||
439 | if ( has_call_error(_session, _msg) == 0 ) | ||
440 | return 0; | ||
441 | |||
442 | _session->_call->_state = call_active; | ||
443 | |||
444 | flush_peer_type ( _session, _msg, 0 ); | ||
445 | |||
446 | throw_event ( _session->_event_handler, msi_start_call_callback, _session ); | ||
447 | return 1; | ||
448 | } | ||
449 | int msi_handle_recv_reject ( msi_session_t* _session, msi_msg_t* _msg ) | ||
450 | { | ||
451 | assert(_session); | ||
452 | |||
453 | if ( has_call_error(_session, _msg) == 0 ) | ||
454 | return 0; | ||
455 | |||
456 | msi_msg_t* _msg_end = msi_msg_new ( TYPE_REQUEST, stringify_request ( _end ) ); | ||
457 | msi_send_msg ( _session, _msg_end ); | ||
458 | msi_free_msg ( _msg_end ); | ||
459 | |||
460 | throw_event ( _session->_event_handler, msi_reject_call_callback, _session ); | ||
461 | |||
462 | return 1; | ||
463 | } | ||
464 | int msi_handle_recv_cancel ( msi_session_t* _session, msi_msg_t* _msg ) | ||
465 | { | ||
466 | assert(_session); | ||
467 | |||
468 | if ( has_call_error(_session, _msg) == 0 ) | ||
469 | return 0; | ||
470 | |||
471 | msi_msg_t* _msg_ending = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _ending ) ); | ||
472 | msi_send_msg ( _session, _msg_ending ); | ||
473 | msi_free_msg ( _msg_ending ); | ||
474 | |||
475 | msi_terminate_call ( _session ); | ||
476 | |||
477 | throw_event ( _session->_event_handler, msi_cancel_call_callback, _session ); | ||
478 | |||
479 | return 1; | ||
480 | } | ||
481 | int msi_handle_recv_end ( msi_session_t* _session, msi_msg_t* _msg ) | ||
482 | { | ||
483 | assert(_session); | ||
484 | |||
485 | if ( has_call_error(_session, _msg) == 0 ) | ||
486 | return 0; | ||
487 | |||
488 | msi_msg_t* _msg_ending = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _ending ) ); | ||
489 | msi_send_msg ( _session, _msg_ending ); | ||
490 | msi_free_msg ( _msg_ending ); | ||
491 | |||
492 | msi_terminate_call ( _session ); | ||
493 | |||
494 | throw_event ( _session->_event_handler, msi_end_call_callback, _session ); | ||
495 | |||
496 | return 1; | ||
497 | } | ||
498 | /*--------*/ | ||
499 | |||
500 | /* RESPONSES */ | ||
501 | int msi_handle_recv_ringing ( msi_session_t* _session, msi_msg_t* _msg ) | ||
502 | { | ||
503 | assert(_session); | ||
504 | |||
505 | if ( has_call_error(_session, _msg) == 0 ) | ||
506 | return 0; | ||
507 | |||
508 | throw_event ( _session->_event_handler, msi_ringing_callback, _session ); | ||
509 | |||
510 | return 1; | ||
511 | } | ||
512 | int msi_handle_recv_starting ( msi_session_t* _session, msi_msg_t* _msg ) | ||
513 | { | ||
514 | assert(_session); | ||
515 | |||
516 | if ( has_call_error(_session, _msg) == 0 ) | ||
517 | return 0; | ||
518 | |||
519 | _session->_call->_state = call_active; | ||
520 | |||
521 | msi_msg_t* _msg_start = msi_msg_new ( TYPE_REQUEST, stringify_request ( _start ) ); | ||
522 | msi_send_msg ( _session, _msg_start ); | ||
523 | msi_free_msg ( _msg_start ); | ||
524 | |||
525 | flush_peer_type ( _session, _msg, 0 ); | ||
526 | |||
527 | throw_event ( _session->_event_handler, msi_starting_callback, _session ); | ||
528 | cancel_timer_event(_session->_event_handler, _session->_call->_outgoing_timer_id); | ||
529 | _session->_call->_outgoing_timer_id = 0; | ||
530 | |||
531 | return 1; | ||
532 | } | ||
533 | int msi_handle_recv_ending ( msi_session_t* _session, msi_msg_t* _msg ) | ||
534 | { | ||
535 | assert(_session); | ||
536 | |||
537 | if ( has_call_error(_session, _msg) == 0 ) | ||
538 | return 0; | ||
539 | |||
540 | msi_terminate_call ( _session ); | ||
541 | throw_event ( _session->_event_handler, msi_ending_callback, _session ); | ||
542 | |||
543 | return 1; | ||
544 | } | ||
545 | int msi_handle_recv_error ( msi_session_t* _session, msi_msg_t* _msg ) | ||
546 | { | ||
547 | assert(_session); | ||
548 | assert(_session->_call); | ||
549 | |||
550 | /* Handle error accordingly */ | ||
551 | if ( _msg->_reason ) { | ||
552 | _session->_last_error_id = atoi((const char*)_msg->_reason->_header_value); | ||
553 | _session->_last_error_str = stringify_error(_session->_last_error_id); | ||
554 | } | ||
555 | |||
556 | msi_terminate_call(_session); | ||
557 | |||
558 | throw_event ( _session->_event_handler, msi_error_callback, _session ); | ||
559 | |||
560 | return 1; | ||
561 | } | ||
562 | /* ------------------ */ | ||
563 | |||
564 | MCBTYPE msi_handle_timeout (void* _arg) | ||
565 | { | ||
566 | msi_session_t* _session = _arg; | ||
567 | msi_terminate_call(_session); | ||
568 | |||
569 | (*msi_timeout_callback) (_arg); | ||
570 | (*msi_ending_callback) (_arg); | ||
571 | |||
572 | } | ||
573 | |||
574 | /*------------------------*/ | ||
575 | /*------------------------*/ | ||
576 | /*------------------------*/ | ||
577 | /*------------------------*/ | ||
578 | /*------------------------*/ | ||
579 | /*------------------------*/ | ||
580 | /*------------------------*/ | ||
581 | /*------------------------*/ | ||
582 | /*------------------------*/ | ||
583 | /*------------------------*/ | ||
584 | /*------------------------*/ | ||
585 | /*------------------------*/ | ||
586 | |||
587 | int msi_invite ( msi_session_t* _session, call_type _call_type, uint32_t _timeoutms ) | ||
588 | { | ||
589 | assert(_session); | ||
590 | |||
591 | if ( !msi_send_message_callback ) | ||
592 | return 0; | ||
593 | |||
594 | msi_msg_t* _msg_invite = msi_msg_new ( TYPE_REQUEST, stringify_request ( _invite ) ); | ||
595 | |||
596 | _session->_call = msi_init_call ( _session, 1, _timeoutms ); /* Just one for now */ | ||
597 | msi_genterate_call_id(_session->_call->_id, _CALL_ID_LEN); | ||
598 | _session->_call->_type_local = _call_type; | ||
599 | /* Do whatever with message */ | ||
600 | |||
601 | if ( _call_type == type_audio ) { | ||
602 | msi_msg_set_call_type ( _msg_invite, ( const uint8_t* ) CT_AUDIO_HEADER_VALUE ); | ||
603 | } else { | ||
604 | msi_msg_set_call_type ( _msg_invite, ( const uint8_t* ) CT_VIDEO_HEADER_VALUE ); | ||
605 | } | ||
606 | |||
607 | msi_send_msg ( _session, _msg_invite ); | ||
608 | msi_free_msg ( _msg_invite ); | ||
609 | |||
610 | _session->_call->_state = call_inviting; | ||
611 | |||
612 | _session->_call->_outgoing_timer_id = throw_timer_event(_session->_event_handler, msi_handle_timeout, _session, _timeoutms ); | ||
613 | |||
614 | return 1; | ||
615 | } | ||
616 | int msi_hangup ( msi_session_t* _session ) | ||
617 | { | ||
618 | assert(_session); | ||
619 | |||
620 | if ( !_session->_call || ( !msi_send_message_callback && _session->_call->_state != call_active ) ) | ||
621 | return 0; | ||
622 | |||
623 | msi_msg_t* _msg_ending = msi_msg_new ( TYPE_REQUEST, stringify_request ( _end ) ); | ||
624 | msi_send_msg ( _session, _msg_ending ); | ||
625 | msi_free_msg ( _msg_ending ); | ||
626 | |||
627 | return 1; | ||
628 | } | ||
629 | |||
630 | |||
631 | int msi_answer ( msi_session_t* _session, call_type _call_type ) | ||
632 | { | ||
633 | assert(_session); | ||
634 | |||
635 | if ( !msi_send_message_callback || !_session->_call ) | ||
636 | return 0; | ||
637 | |||
638 | msi_msg_t* _msg_starting = msi_msg_new ( TYPE_RESPONSE, stringify_response ( _starting ) ); | ||
639 | _session->_call->_type_local = _call_type; | ||
640 | |||
641 | if ( _call_type == type_audio ) { | ||
642 | msi_msg_set_call_type ( _msg_starting, ( const uint8_t* ) CT_AUDIO_HEADER_VALUE ); | ||
643 | } else { | ||
644 | msi_msg_set_call_type ( _msg_starting, ( const uint8_t* ) CT_VIDEO_HEADER_VALUE ); | ||
645 | } | ||
646 | |||
647 | msi_send_msg ( _session, _msg_starting ); | ||
648 | msi_free_msg ( _msg_starting ); | ||
649 | |||
650 | _session->_call->_state = call_active; | ||
651 | return 1; | ||
652 | } | ||
653 | int msi_cancel ( msi_session_t* _session ) | ||
654 | { | ||
655 | assert(_session); | ||
656 | |||
657 | if ( !_session->_call || !msi_send_message_callback ) | ||
658 | return 0; | ||
659 | |||
660 | msi_msg_t* _msg_cancel = msi_msg_new ( TYPE_REQUEST, stringify_request ( _cancel ) ); | ||
661 | msi_send_msg ( _session, _msg_cancel ); | ||
662 | msi_free_msg ( _msg_cancel ); | ||
663 | |||
664 | |||
665 | |||
666 | return 1; | ||
667 | } | ||
668 | int msi_reject ( msi_session_t* _session ) | ||
669 | { | ||
670 | assert(_session); | ||
671 | |||
672 | if ( !_session->_call || !msi_send_message_callback ) | ||
673 | return 0; | ||
674 | |||
675 | msi_msg_t* _msg_reject = msi_msg_new ( TYPE_REQUEST, stringify_request ( _reject ) ); | ||
676 | msi_send_msg ( _session, _msg_reject ); | ||
677 | msi_free_msg ( _msg_reject ); | ||
678 | |||
679 | return 1; | ||
680 | } | ||
681 | |||
682 | /*------------------------*/ | ||
683 | /*------------------------*/ | ||
684 | /*------------------------*/ | ||
685 | /*------------------------*/ | ||
686 | /*------------------------*/ | ||
687 | /*------------------------*/ | ||
688 | /*------------------------*/ | ||
689 | /*------------------------*/ | ||
690 | /*------------------------*/ | ||
691 | /*------------------------*/ | ||
692 | /*------------------------*/ | ||
693 | /*------------------------*/ | ||
694 | |||
695 | /* OUR MAIN POOL FUNCTION */ | ||
696 | /* | ||
697 | * Forks it self to other thread and then handles the session initiation. | ||
698 | * | ||
699 | * BASIC call flow: | ||
700 | * | ||
701 | * ALICE BOB | ||
702 | * | invite --> | | ||
703 | * | | | ||
704 | * | <-- ringing | | ||
705 | * | | | ||
706 | * | <-- starting | | ||
707 | * | | | ||
708 | * | start --> | | ||
709 | * | | | ||
710 | * | <-- MEDIA TRANS --> | | ||
711 | * | | | ||
712 | * | end --> | | ||
713 | * | | | ||
714 | * | <-- ending | | ||
715 | * | ||
716 | * Alice calls Bob by sending invite packet. | ||
717 | * Bob recvs the packet and sends an ringing packet; | ||
718 | * which notifies Alice that her invite is acknowledged. | ||
719 | * Ringing screen shown on both sides. | ||
720 | * Bob accepts the invite for a call by sending starting packet. | ||
721 | * Alice recvs the starting packet and sends the started packet to | ||
722 | * inform Bob that she recved the starting packet. | ||
723 | * Now the media transmission is established ( i.e. RTP transmission ). | ||
724 | * Alice hangs up and sends end packet. | ||
725 | * Bob recves the end packet and sends ending packet | ||
726 | * as the acknowledgement that the call is ending. | ||
727 | * | ||
728 | * | ||
729 | */ | ||
730 | |||
731 | |||
732 | /* | ||
733 | * Needs a bit more work on the protocol | ||
734 | */ | ||
735 | void* msi_poll_stack ( void* _session_p ) | ||
736 | { | ||
737 | msi_session_t* _session = ( msi_session_t* ) _session_p; | ||
738 | msi_msg_t* _msg = NULL; | ||
739 | |||
740 | uint32_t* _frequ = &_session->_frequ; | ||
741 | while ( _session ) { | ||
742 | |||
743 | /* At this point it's already parsed */ | ||
744 | _msg = receive_message ( _session ); | ||
745 | |||
746 | if ( _msg ) { | ||
747 | |||
748 | if ( _msg->_request ) { /* Handle request */ | ||
749 | |||
750 | const uint8_t* _request_value = _msg->_request->_header_value; | ||
751 | |||
752 | if ( same ( _request_value, stringify_request ( _invite ) ) ) { | ||
753 | msi_handle_recv_invite ( _session, _msg ); | ||
754 | |||
755 | } else if ( same ( _request_value, stringify_request ( _start ) ) ) { | ||
756 | msi_handle_recv_start ( _session, _msg ); | ||
757 | |||
758 | } else if ( same ( _request_value, stringify_request ( _cancel ) ) ) { | ||
759 | msi_handle_recv_cancel ( _session, _msg ); | ||
760 | |||
761 | } else if ( same ( _request_value, stringify_request ( _reject ) ) ) { | ||
762 | msi_handle_recv_reject ( _session, _msg ); | ||
763 | |||
764 | } else if ( same ( _request_value, stringify_request ( _end ) ) ) { | ||
765 | msi_handle_recv_end ( _session, _msg ); | ||
766 | } | ||
767 | |||
768 | } else if ( _msg->_response ) { /* Handle response */ | ||
769 | |||
770 | const uint8_t* _response_value = _msg->_response->_header_value; | ||
771 | |||
772 | if ( same ( _response_value, stringify_response ( _ringing ) ) ) { | ||
773 | msi_handle_recv_ringing ( _session, _msg ); | ||
774 | |||
775 | } else if ( same ( _response_value, stringify_response ( _starting ) ) ) { | ||
776 | msi_handle_recv_starting ( _session, _msg ); | ||
777 | |||
778 | } else if ( same ( _response_value, stringify_response ( _ending ) ) ) { | ||
779 | msi_handle_recv_ending ( _session, _msg ); | ||
780 | |||
781 | } else if ( same ( _response_value, stringify_response ( _error ) ) ) { | ||
782 | msi_handle_recv_error ( _session, _msg ); | ||
783 | } | ||
784 | |||
785 | } | ||
786 | |||
787 | msi_free_msg ( _msg ); | ||
788 | |||
789 | } | ||
790 | usleep ( *_frequ ); | ||
791 | } | ||
792 | |||
793 | return NULL; | ||
794 | } | ||
795 | |||
796 | /*------------------------*/ | ||
797 | /*------------------------*/ | ||
798 | /*------------------------*/ | ||
799 | /*------------------------*/ | ||
800 | /*------------------------*/ | ||
801 | /*------------------------*/ | ||
802 | /*------------------------*/ | ||
803 | /*------------------------*/ | ||
804 | /*------------------------*/ | ||
805 | /*------------------------*/ | ||
806 | /*------------------------*/ | ||
807 | /*------------------------*/ | ||
808 | |||
809 | /* Easy way to start the poll */ | ||
810 | |||
811 | pthread_t msi_start_main_loop ( msi_session_t* _session, uint32_t _frequms ) | ||
812 | { | ||
813 | assert(_session); | ||
814 | |||
815 | int _status; | ||
816 | pthread_t _thread_id; | ||
817 | |||
818 | |||
819 | _session->_frequ = _frequms * 1000; | ||
820 | |||
821 | _status = pthread_create ( &_thread_id, NULL, msi_poll_stack, _session ); | ||
822 | |||
823 | if ( _status < 0 ) { | ||
824 | printf ( "Error while starting main loop: %d, %s\n", errno, strerror ( errno ) ); | ||
825 | return _status; | ||
826 | } | ||
827 | |||
828 | _status = pthread_detach ( _thread_id ); | ||
829 | |||
830 | if ( _status < 0 ) { | ||
831 | printf ( "Error while starting main loop: %d, %s\n", errno, strerror ( errno ) ); | ||
832 | } | ||
833 | |||
834 | return _thread_id; | ||
835 | } | ||
diff --git a/toxmsi/toxmsi.h b/toxmsi/toxmsi.h deleted file mode 100644 index d8985c64..00000000 --- a/toxmsi/toxmsi.h +++ /dev/null | |||
@@ -1,145 +0,0 @@ | |||
1 | /* msi_initiation.h | ||
2 | * | ||
3 | * Has function for session initiation along with session description. | ||
4 | * It follows the Tox API ( http://wiki.tox.im/index.php/Messaging_Protocol ). !Red! | ||
5 | * | ||
6 | * | ||
7 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
8 | * | ||
9 | * This file is part of Tox. | ||
10 | * | ||
11 | * Tox is free software: you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License as published by | ||
13 | * the Free Software Foundation, either version 3 of the License, or | ||
14 | * (at your option) any later version. | ||
15 | * | ||
16 | * Tox is distributed in the hope that it will be useful, | ||
17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
19 | * GNU General Public License for more details. | ||
20 | * | ||
21 | * You should have received a copy of the GNU General Public License | ||
22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
23 | * | ||
24 | */ | ||
25 | |||
26 | |||
27 | #ifndef _MSI_IMPL_H_ | ||
28 | #define _MSI_IMPL_H_ | ||
29 | |||
30 | #include <inttypes.h> | ||
31 | #include "tox.h" | ||
32 | #include <pthread.h> | ||
33 | |||
34 | #define MCBTYPE void | ||
35 | #define MCBARGS void* _arg | ||
36 | #define MCALLBACK MCBTYPE(*callback)(void* _arg) | ||
37 | |||
38 | #define MSI_PACKET 69 | ||
39 | |||
40 | #define CT_AUDIO_HEADER_VALUE "AUDIO" | ||
41 | #define CT_VIDEO_HEADER_VALUE "VIDEO" | ||
42 | |||
43 | /* define size for call_id */ | ||
44 | #define _CALL_ID_LEN 12 | ||
45 | |||
46 | typedef enum { | ||
47 | type_audio = 1, | ||
48 | type_video, | ||
49 | } call_type; | ||
50 | |||
51 | typedef enum { | ||
52 | call_inviting, /* when sending call invite */ | ||
53 | call_starting, /* when getting call invite */ | ||
54 | call_active, | ||
55 | call_hold | ||
56 | |||
57 | } call_state; | ||
58 | |||
59 | typedef int crypto_key; | ||
60 | |||
61 | typedef struct msi_call_s { /* Call info structure */ | ||
62 | call_state _state; | ||
63 | call_type _type_local; | ||
64 | call_type* _type_peer; /* Support for conference starts with this */ | ||
65 | uint8_t _id[_CALL_ID_LEN]; /* Random value identifying the call */ | ||
66 | crypto_key _key; /* What is the type again? */ | ||
67 | uint16_t _participants; /* Number of participants */ | ||
68 | uint32_t _timeoutst; /* Time of the timeout for some action to end; 0 if infinite */ | ||
69 | int _outgoing_timer_id; /* Timer id */ | ||
70 | |||
71 | } msi_call_t; | ||
72 | |||
73 | typedef struct msi_session_s { | ||
74 | pthread_mutex_t _mutex; | ||
75 | |||
76 | crypto_key _key; /* The key */ | ||
77 | |||
78 | /* Call information/handler. ( Maybe only information? ) */ | ||
79 | msi_call_t* _call; | ||
80 | |||
81 | /* Storage for message receiving */ | ||
82 | struct msi_msg_s* _oldest_msg; | ||
83 | struct msi_msg_s* _last_msg; /* tail */ | ||
84 | |||
85 | /*int _friend_id;*/ | ||
86 | tox_IP_Port _friend_id; | ||
87 | |||
88 | int _last_error_id; /* Determine the last error */ | ||
89 | const uint8_t* _last_error_str; | ||
90 | |||
91 | const uint8_t* _user_agent; | ||
92 | |||
93 | void* _agent_handler; /* Pointer to an object that is handling msi */ | ||
94 | void* _core_handler; /* Pointer to networking core or to anything that | ||
95 | * should handle interaction with core/networking | ||
96 | */ | ||
97 | void* _event_handler; /* Pointer to an object which handles the events */ | ||
98 | |||
99 | uint32_t _frequ; | ||
100 | uint32_t _call_timeout; /* Time of the timeout for some action to end; 0 if infinite */ | ||
101 | } msi_session_t; | ||
102 | |||
103 | |||
104 | |||
105 | msi_session_t* msi_init_session ( void* _core_handler, const uint8_t* _user_agent ); | ||
106 | int msi_terminate_session ( msi_session_t* _session ); | ||
107 | |||
108 | pthread_t msi_start_main_loop ( msi_session_t* _session, uint32_t _frequms ); | ||
109 | |||
110 | /* Registering callbacks */ | ||
111 | |||
112 | /*void msi_register_callback_send(int (*callback) ( int, uint8_t*, uint32_t ) );*/ | ||
113 | void msi_register_callback_send ( int ( *callback ) ( void* _core_handler, tox_IP_Port, uint8_t*, uint32_t ) ); | ||
114 | |||
115 | /* Callbacks that handle the states */ | ||
116 | void msi_register_callback_call_started ( MCALLBACK ); | ||
117 | void msi_register_callback_call_canceled ( MCALLBACK ); | ||
118 | void msi_register_callback_call_rejected ( MCALLBACK ); | ||
119 | void msi_register_callback_call_ended ( MCALLBACK ); | ||
120 | |||
121 | void msi_register_callback_recv_invite ( MCALLBACK ); | ||
122 | void msi_register_callback_recv_ringing ( MCALLBACK ); | ||
123 | void msi_register_callback_recv_starting ( MCALLBACK ); | ||
124 | void msi_register_callback_recv_ending ( MCALLBACK ); | ||
125 | void msi_register_callback_recv_error ( MCALLBACK ); | ||
126 | |||
127 | void msi_register_callback_requ_timeout ( MCALLBACK ); | ||
128 | /* -------- */ | ||
129 | |||
130 | |||
131 | /* Function handling receiving from core */ | ||
132 | /*static int msi_handlepacket ( tox_IP_Port ip_port, uint8_t* _data, uint16_t _lenght ); */ | ||
133 | |||
134 | /* functions describing the usage of msi */ | ||
135 | int msi_invite ( msi_session_t* _session, call_type _call_type, uint32_t _timeoutms ); | ||
136 | int msi_hangup ( msi_session_t* _session ); | ||
137 | |||
138 | int msi_answer ( msi_session_t* _session, call_type _call_type ); | ||
139 | int msi_cancel ( msi_session_t* _session ); | ||
140 | int msi_reject ( msi_session_t* _session ); | ||
141 | |||
142 | int msi_send_msg ( msi_session_t* _session, struct msi_msg_s* _msg ); | ||
143 | void msi_store_msg ( msi_session_t* _session, struct msi_msg_s* _msg ); | ||
144 | |||
145 | #endif /* _MSI_IMPL_H_ */ | ||
diff --git a/toxmsi/toxmsi_event.c b/toxmsi/toxmsi_event.c deleted file mode 100644 index d8c0d269..00000000 --- a/toxmsi/toxmsi_event.c +++ /dev/null | |||
@@ -1,214 +0,0 @@ | |||
1 | |||
2 | #ifdef HAVE_CONFIG_H | ||
3 | #include "config.h" | ||
4 | #endif /* HAVE_CONFIG_H */ | ||
5 | |||
6 | #include <stdlib.h> | ||
7 | |||
8 | #include "toxmsi_event.h" | ||
9 | |||
10 | #include "../toxrtp/toxrtp_helper.h" | ||
11 | #include <assert.h> | ||
12 | #include <stdlib.h> | ||
13 | #include <unistd.h> | ||
14 | |||
15 | static int _unique_id = 1; | ||
16 | |||
17 | /* clear events */ | ||
18 | void clear_events (event_container_t** _event_container, size_t* _counter) | ||
19 | { | ||
20 | assert( *_event_container ); | ||
21 | |||
22 | free(*_event_container); | ||
23 | *_event_container = NULL; | ||
24 | |||
25 | *_counter = 0; | ||
26 | } | ||
27 | |||
28 | int pop_id ( event_container_t** _event_container, size_t* _counter, int _id ) | ||
29 | { | ||
30 | if ( !*_event_container || !*_counter || !_id ) | ||
31 | return FAILURE; | ||
32 | |||
33 | event_container_t* _it = *_event_container; | ||
34 | int i; | ||
35 | |||
36 | for ( i = *_counter; i > 0 ; -- i ){ | ||
37 | if ( _it->_id == _id ) { /* Hit! */ | ||
38 | break; | ||
39 | } | ||
40 | ++_it; | ||
41 | } | ||
42 | |||
43 | if ( i ) { | ||
44 | for ( ; i > 0; -- i ){ *_it = *(_it + 1); ++_it; } | ||
45 | -- (*_counter); | ||
46 | *_event_container = realloc(*_event_container, sizeof(event_container_t) * (*_counter)); /* resize */ | ||
47 | |||
48 | if ( *_counter ) | ||
49 | assert(*_event_container); | ||
50 | |||
51 | return SUCCESS; | ||
52 | |||
53 | } else { | ||
54 | assert(i); | ||
55 | return FAILURE; | ||
56 | } | ||
57 | } | ||
58 | |||
59 | /* main poll for event execution */ | ||
60 | void* event_poll( void* _event_handler_p ) | ||
61 | { | ||
62 | event_handler_t* _event_handler = _event_handler_p; | ||
63 | uint32_t* _frequms = &_event_handler->_frequms; | ||
64 | |||
65 | |||
66 | while ( _event_handler->_running ) | ||
67 | { | ||
68 | |||
69 | if ( _event_handler->_events_count ){ | ||
70 | pthread_mutex_lock(&_event_handler->_mutex); | ||
71 | |||
72 | int i; | ||
73 | for ( i = 0; i < _event_handler->_events_count; i ++ ){ | ||
74 | _event_handler->_events[i]._event(_event_handler->_events[i]._event_args); | ||
75 | |||
76 | } | ||
77 | clear_events(&_event_handler->_events, &_event_handler->_events_count); | ||
78 | |||
79 | pthread_mutex_unlock(&_event_handler->_mutex); | ||
80 | } | ||
81 | |||
82 | if ( _event_handler->_timed_events_count ){ | ||
83 | pthread_mutex_lock(&_event_handler->_mutex); | ||
84 | |||
85 | uint32_t _time = t_time(); | ||
86 | |||
87 | if ( _event_handler->_timed_events[0]._timeout < _time ) { | ||
88 | _event_handler->_timed_events[0]._event(_event_handler->_timed_events[0]._event_args); | ||
89 | |||
90 | pop_id(&_event_handler->_timed_events, | ||
91 | &_event_handler->_timed_events_count, | ||
92 | _event_handler->_timed_events[0]._id); | ||
93 | } | ||
94 | pthread_mutex_unlock(&_event_handler->_mutex); | ||
95 | } | ||
96 | |||
97 | |||
98 | usleep(*_frequms); | ||
99 | } | ||
100 | |||
101 | _event_handler->_running = -1; | ||
102 | pthread_exit(NULL); | ||
103 | } | ||
104 | |||
105 | void push_event ( event_container_t** _container, size_t* _counter, event_t _func, event_arg_t _arg ) | ||
106 | { | ||
107 | (*_counter)++; | ||
108 | (*_container) = realloc((*_container), sizeof(event_container_t) * (*_counter)); | ||
109 | assert((*_container) != NULL); | ||
110 | |||
111 | (*_container[*_counter - 1])._event = _func; | ||
112 | (*_container[*_counter - 1])._event_args = _arg; | ||
113 | (*_container[*_counter - 1])._timeout = 0; | ||
114 | (*_container[*_counter - 1])._id = 0; | ||
115 | } | ||
116 | |||
117 | void throw_event( void* _event_handler_p, event_t _func, event_arg_t _arg ) | ||
118 | { | ||
119 | if ( !_func ) | ||
120 | return; | ||
121 | |||
122 | event_handler_t* _event_handler = _event_handler_p; | ||
123 | |||
124 | pthread_mutex_lock(&_event_handler->_mutex); | ||
125 | |||
126 | push_event(&_event_handler->_events, &_event_handler->_events_count, _func, _arg); | ||
127 | |||
128 | pthread_mutex_unlock(&_event_handler->_mutex); | ||
129 | } | ||
130 | |||
131 | int throw_timer_event ( void* _event_handler_p, event_t _func, event_arg_t _arg, uint32_t _timeout) | ||
132 | { | ||
133 | if ( !_func ) | ||
134 | return FAILURE; | ||
135 | |||
136 | event_handler_t* _event_handler = _event_handler_p; | ||
137 | |||
138 | pthread_mutex_lock(&_event_handler->_mutex); | ||
139 | |||
140 | push_event(&_event_handler->_timed_events, &_event_handler->_timed_events_count, _func, _arg); | ||
141 | size_t _counter = _event_handler->_timed_events_count; | ||
142 | _event_handler->_timed_events[_counter - 1]._timeout = _timeout + t_time(); | ||
143 | _event_handler->_timed_events[_counter - 1]._id = _unique_id; ++_unique_id; | ||
144 | |||
145 | |||
146 | /* reorder */ | ||
147 | if ( _counter > 1 ) { | ||
148 | |||
149 | int i = _counter - 1; | ||
150 | /* start from behind excluding last added member */ | ||
151 | event_container_t* _it = &_event_handler->_timed_events[i - 1]; | ||
152 | |||
153 | event_container_t _last_added = _event_handler->_timed_events[i]; | ||
154 | |||
155 | for ( ; i > 0; --i ) { | ||
156 | if ( _it->_timeout > _timeout ){ | ||
157 | *(_it + 1) = *_it; | ||
158 | *_it = _last_added; -- _it; | ||
159 | } | ||
160 | } | ||
161 | |||
162 | } | ||
163 | |||
164 | pthread_mutex_unlock(&_event_handler->_mutex); | ||
165 | |||
166 | return _event_handler->_timed_events[_counter - 1]._id; | ||
167 | } | ||
168 | int cancel_timer_event ( void* _event_handler_p, int _id ) | ||
169 | { | ||
170 | event_handler_t* _event_handler = _event_handler_p; | ||
171 | return pop_id(&_event_handler->_timed_events, &_event_handler->_timed_events_count, _id); | ||
172 | } | ||
173 | |||
174 | event_handler_t* init_event_poll (uint32_t _frequms) | ||
175 | { | ||
176 | event_handler_t* _retu = calloc(sizeof(event_handler_t), 1); | ||
177 | assert(_retu); | ||
178 | /* Initialize basic events */ | ||
179 | _retu->_events = NULL ; | ||
180 | |||
181 | /* Initialize timed events */ | ||
182 | _retu->_timed_events = NULL; | ||
183 | |||
184 | _retu->_frequms = _frequms; | ||
185 | _retu->_running = 1; | ||
186 | pthread_mutex_init(&_retu->_mutex, NULL); | ||
187 | |||
188 | pthread_create(&_retu->_thread_id, NULL, event_poll, _retu); | ||
189 | int _rc = pthread_detach(_retu->_thread_id); | ||
190 | assert(_rc == 0); | ||
191 | |||
192 | return _retu; | ||
193 | } | ||
194 | |||
195 | int terminate_event_poll(event_handler_t* _handler) | ||
196 | { | ||
197 | if ( !_handler ) | ||
198 | return FAILURE; | ||
199 | |||
200 | _handler->_running = 0; | ||
201 | while (_handler->_running != -1); /* Wait for execution */ | ||
202 | |||
203 | if (_handler->_events) | ||
204 | clear_events(&_handler->_events, &_handler->_events_count); | ||
205 | if (_handler->_events) | ||
206 | clear_events(&_handler->_timed_events, &_handler->_timed_events_count); | ||
207 | |||
208 | pthread_mutex_destroy( &_handler->_mutex ); | ||
209 | |||
210 | free(_handler); | ||
211 | |||
212 | return SUCCESS; | ||
213 | } | ||
214 | |||
diff --git a/toxmsi/toxmsi_event.h b/toxmsi/toxmsi_event.h deleted file mode 100644 index 032e4df5..00000000 --- a/toxmsi/toxmsi_event.h +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | #ifndef _MSI__EVENT_H_ | ||
2 | #define _MSI__EVENT_H_ | ||
3 | |||
4 | #include <stddef.h> | ||
5 | #include <inttypes.h> | ||
6 | #include <pthread.h> | ||
7 | |||
8 | typedef void* event_arg_t; | ||
9 | |||
10 | typedef void ( *event_t ) ( event_arg_t ); | ||
11 | typedef void ( *timed_event_t ) ( event_arg_t ); | ||
12 | |||
13 | typedef struct event_container_s { | ||
14 | event_t _event; | ||
15 | event_arg_t _event_args; | ||
16 | uint32_t _timeout; | ||
17 | long long _id; | ||
18 | |||
19 | } event_container_t; | ||
20 | |||
21 | typedef struct event_handler_s { | ||
22 | event_container_t* _events; | ||
23 | size_t _events_count; | ||
24 | |||
25 | event_container_t* _timed_events; | ||
26 | size_t _timed_events_count; | ||
27 | |||
28 | uint32_t _frequms; | ||
29 | int _running; | ||
30 | |||
31 | pthread_mutex_t _mutex; | ||
32 | pthread_t _thread_id; | ||
33 | |||
34 | } event_handler_t; | ||
35 | |||
36 | event_handler_t* init_event_poll ( uint32_t _frequms ); | ||
37 | int terminate_event_poll ( event_handler_t* _event_handler ); | ||
38 | |||
39 | void throw_event ( void* _event_handler_p, event_t _func, event_arg_t _arg ); | ||
40 | |||
41 | /* Not yet ready for use */ | ||
42 | int throw_timer_event ( void* _event_handler_p, event_t _func, event_arg_t _arg, uint32_t _timeout); | ||
43 | int cancel_timer_event ( void* _event_handler_p, int _id ); | ||
44 | |||
45 | |||
46 | #endif /* _MSI__EVENT_H_ */ | ||
diff --git a/toxmsi/toxmsi_header.c b/toxmsi/toxmsi_header.c deleted file mode 100644 index 448ebc7f..00000000 --- a/toxmsi/toxmsi_header.c +++ /dev/null | |||
@@ -1,181 +0,0 @@ | |||
1 | |||
2 | #ifdef HAVE_CONFIG_H | ||
3 | #include "config.h" | ||
4 | #endif /* HAVE_CONFIG_H */ | ||
5 | |||
6 | #include "toxmsi_message.h" | ||
7 | #include <string.h> | ||
8 | #include "../toxrtp/toxrtp_helper.h" | ||
9 | #include <assert.h> | ||
10 | #include "../toxcore/Lossless_UDP.h" | ||
11 | |||
12 | #define ALLOC_ADD_DATA(_tempval, _hdrlist, _fielddef, _msgvar, _alloctype) \ | ||
13 | _tempval = msi_search_field(_hdrlist, (const uint8_t*)_fielddef); \ | ||
14 | if ( _tempval ){ \ | ||
15 | _msgvar = calloc(sizeof(_alloctype), 1); \ | ||
16 | assert(_msgvar); \ | ||
17 | _msgvar->_header_value = _tempval; \ | ||
18 | } | ||
19 | |||
20 | uint8_t* msi_search_field ( msi_header_t* _list, const uint8_t* _field ) | ||
21 | { | ||
22 | assert(_list); | ||
23 | assert(_field); | ||
24 | |||
25 | msi_header_t* _iterator; | ||
26 | |||
27 | for ( _iterator = _list; | ||
28 | _iterator && strcmp((const char*)_iterator->_header_field, (const char*)_field) != 0; | ||
29 | _iterator = _iterator->next ); | ||
30 | |||
31 | if ( _iterator ){ | ||
32 | return t_strallcpy(_iterator->_header_value); | ||
33 | } else return NULL; | ||
34 | } | ||
35 | |||
36 | int msi_parse_headers ( msi_msg_t* _msg ) | ||
37 | { | ||
38 | assert(_msg); | ||
39 | |||
40 | if ( !_msg->_headers ) | ||
41 | return FAILURE; | ||
42 | |||
43 | msi_header_t* _list = _msg->_headers; | ||
44 | uint8_t* _field_current; | ||
45 | |||
46 | ALLOC_ADD_DATA(_field_current, _list, _CALL_ID_FIELD, _msg->_call_id, msi_header_call_id_t) | ||
47 | ALLOC_ADD_DATA(_field_current, _list, _VERSION_FIELD, _msg->_version, msi_header_version_t) | ||
48 | ALLOC_ADD_DATA(_field_current, _list, _REQUEST_FIELD, _msg->_request, msi_header_request_t) | ||
49 | ALLOC_ADD_DATA(_field_current, _list, _RESPONSE_FIELD, _msg->_response, msi_header_response_t) | ||
50 | ALLOC_ADD_DATA(_field_current, _list, _FRIENDID_FIELD, _msg->_friend_id, msi_header_friendid_t) | ||
51 | ALLOC_ADD_DATA(_field_current, _list, _CALLTYPE_FIELD, _msg->_call_type, msi_header_call_type_t) | ||
52 | ALLOC_ADD_DATA(_field_current, _list, _USERAGENT_FIELD, _msg->_user_agent, msi_header_user_agent_t) | ||
53 | ALLOC_ADD_DATA(_field_current, _list, _INFO_FIELD, _msg->_info, msi_header_info_t) | ||
54 | ALLOC_ADD_DATA(_field_current, _list, _REASON_FIELD, _msg->_reason, msi_header_reason_t) | ||
55 | |||
56 | /* Since we don't need the raw header anymore remove it */ | ||
57 | msi_header_t* _temp; | ||
58 | while ( _list ){ | ||
59 | _temp = _list->next; | ||
60 | free(_list->_header_field); | ||
61 | free(_list->_header_value); | ||
62 | free(_list); | ||
63 | _list = _temp; | ||
64 | } | ||
65 | |||
66 | _msg->_headers = NULL; | ||
67 | |||
68 | return SUCCESS; | ||
69 | } | ||
70 | |||
71 | /* | ||
72 | * If you find better way of parsing values let me know | ||
73 | */ | ||
74 | msi_header_t* msi_add_new_header ( uint8_t* _value ) | ||
75 | { | ||
76 | if ( !_value ) | ||
77 | return NULL; | ||
78 | |||
79 | size_t _length = t_memlen(_value); | ||
80 | |||
81 | if ( !_length ) { | ||
82 | return NULL; | ||
83 | } | ||
84 | |||
85 | size_t _first_len = t_strfind(_value, (const uint8_t*)" "); | ||
86 | if ( !_first_len ){ | ||
87 | return NULL; | ||
88 | } | ||
89 | |||
90 | size_t _second_len = (_length - _first_len); | ||
91 | if ( !_second_len ){ | ||
92 | return NULL; | ||
93 | } | ||
94 | |||
95 | |||
96 | uint8_t* _identifier = calloc(sizeof (uint8_t), (_first_len + 1) ); | ||
97 | uint8_t* _data = calloc(sizeof (uint8_t), (_second_len + 1) ); | ||
98 | |||
99 | assert(_identifier); | ||
100 | assert(_data); | ||
101 | |||
102 | |||
103 | uint8_t* _p_it = _value; | ||
104 | size_t _num_it; | ||
105 | |||
106 | for ( _num_it = 0; *_p_it != ' '; _num_it++ ){ | ||
107 | _identifier[_num_it] = *_p_it; | ||
108 | ++_p_it; | ||
109 | } | ||
110 | _identifier[_num_it] = '\0'; | ||
111 | ++_p_it; | ||
112 | |||
113 | |||
114 | for ( _num_it = 0; *_p_it != '\r'; _num_it++ ){ | ||
115 | _data[_num_it] = *_p_it; | ||
116 | ++_p_it; | ||
117 | } | ||
118 | _data[_num_it] = '\r'; | ||
119 | _data[_num_it + 1] = '\0'; | ||
120 | |||
121 | msi_header_t* _retu = calloc(sizeof(msi_header_t), 1); | ||
122 | assert(_retu); | ||
123 | |||
124 | _retu->_header_field = _identifier; | ||
125 | _retu->_header_value = _data; | ||
126 | |||
127 | _retu->next = NULL; | ||
128 | |||
129 | return _retu; | ||
130 | } | ||
131 | |||
132 | msi_header_t* msi_parse_raw_data ( const uint8_t* _data ) | ||
133 | { | ||
134 | assert(_data); | ||
135 | |||
136 | uint8_t* _header_string; | ||
137 | |||
138 | _header_string = (uint8_t*) strtok ((char*)_data, _RAW_TERMINATOR); | ||
139 | |||
140 | msi_header_t* _head = msi_add_new_header(_header_string); | ||
141 | msi_header_t* _it = _head; | ||
142 | |||
143 | while ( _header_string && _it ){ | ||
144 | |||
145 | _header_string = (uint8_t*) strtok (NULL, _RAW_TERMINATOR); | ||
146 | _it->next = msi_add_new_header(_header_string); | ||
147 | if ( _it->next ){ | ||
148 | _it = _it->next; | ||
149 | } | ||
150 | } | ||
151 | |||
152 | /* Iterate through list and remove all fault headers if any */ | ||
153 | |||
154 | msi_header_t* _tmp = _it; | ||
155 | |||
156 | for ( _it = _head; _it; _it = _it->next ){ | ||
157 | |||
158 | if ( !_it->_header_value || !_it->_header_field ) { | ||
159 | _tmp ->next = _it->next; | ||
160 | |||
161 | if ( _it->_header_field ) | ||
162 | free(_it->_header_field); | ||
163 | if ( _it->_header_value ) | ||
164 | free(_it->_header_value); | ||
165 | |||
166 | if ( _it == _head ){ | ||
167 | _head = _head->next; | ||
168 | } | ||
169 | |||
170 | free(_it); | ||
171 | _it = _tmp; | ||
172 | } else | ||
173 | _tmp = _it; | ||
174 | |||
175 | } | ||
176 | |||
177 | return _head; | ||
178 | } | ||
179 | |||
180 | |||
181 | |||
diff --git a/toxmsi/toxmsi_header.h b/toxmsi/toxmsi_header.h deleted file mode 100644 index 599fafa3..00000000 --- a/toxmsi/toxmsi_header.h +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | #ifndef _MSI_HEADER_ | ||
2 | #define _MSI_HEADER_ | ||
3 | |||
4 | /* Basic format of the unparsed header string | ||
5 | * ( No spaces in field allowed ) | ||
6 | * Version 0.1.1\n\r | ||
7 | * Request INVITE\n\r | ||
8 | * Response\n\r | ||
9 | * Friend-id ( from ip )\n\r | ||
10 | * Call-type AUDIO\n\r | ||
11 | * User-agent phone-v.1.0.0\n\r | ||
12 | */ | ||
13 | |||
14 | |||
15 | /* define raw header terminator */ | ||
16 | static const char* _RAW_TERMINATOR = "\n\r"; | ||
17 | |||
18 | /* define string formats for the identifiers */ | ||
19 | #define _VERSION_FIELD "Version" | ||
20 | #define _REQUEST_FIELD "Request" | ||
21 | #define _RESPONSE_FIELD "Response" | ||
22 | #define _FRIENDID_FIELD "Friend-id" | ||
23 | #define _CALLTYPE_FIELD "Call-type" | ||
24 | #define _USERAGENT_FIELD "User-agent" | ||
25 | #define _INFO_FIELD "INFO" | ||
26 | #define _REASON_FIELD "Reason" | ||
27 | #define _CALL_ID_FIELD "Call-id" | ||
28 | |||
29 | #define HEADER_VALUES \ | ||
30 | /*uint8_t* _header_field */ \ | ||
31 | uint8_t* _header_value; | ||
32 | |||
33 | typedef struct msi_header_s { /* raw header list */ | ||
34 | uint8_t* _header_field; | ||
35 | uint8_t* _header_value; | ||
36 | |||
37 | struct msi_header_s* next; | ||
38 | |||
39 | } msi_header_t; | ||
40 | |||
41 | |||
42 | |||
43 | typedef struct msi_header_version_s { /* Defines our version */ | ||
44 | HEADER_VALUES | ||
45 | |||
46 | } msi_header_version_t; | ||
47 | |||
48 | typedef struct msi_header_request_s { /* Defines our request */ | ||
49 | HEADER_VALUES | ||
50 | |||
51 | } msi_header_request_t; | ||
52 | |||
53 | typedef struct msi_header_response_s { /* Defines our response */ | ||
54 | HEADER_VALUES | ||
55 | |||
56 | } msi_header_response_t; | ||
57 | |||
58 | typedef struct msi_header_friendid_s { /* Defines source that sent the message */ | ||
59 | HEADER_VALUES | ||
60 | |||
61 | } msi_header_friendid_t; | ||
62 | |||
63 | typedef struct msi_header_call_type_s { /* Defines the type of the call */ | ||
64 | HEADER_VALUES | ||
65 | |||
66 | } msi_header_call_type_t; | ||
67 | |||
68 | typedef struct msi_header_user_agent_s { /* Defines the device of the participant */ | ||
69 | HEADER_VALUES | ||
70 | |||
71 | } msi_header_user_agent_t; | ||
72 | |||
73 | |||
74 | typedef struct msi_header_call_id_s { /* Call id that is used to identify the call */ | ||
75 | HEADER_VALUES | ||
76 | |||
77 | } msi_header_call_id_t; | ||
78 | |||
79 | typedef struct msi_header_info_s { /* Defines informational message header */ | ||
80 | HEADER_VALUES | ||
81 | |||
82 | } msi_header_info_t; | ||
83 | |||
84 | typedef struct msi_header_reason_s { /* Defines reason mostly for error messages */ | ||
85 | HEADER_VALUES | ||
86 | |||
87 | } msi_header_reason_t; | ||
88 | |||
89 | struct msi_msg_s; | ||
90 | |||
91 | /* | ||
92 | * Parses the header list to header types | ||
93 | */ | ||
94 | int msi_parse_headers ( struct msi_msg_s* _msg ); | ||
95 | |||
96 | /* Make sure it's null terminated */ | ||
97 | msi_header_t* msi_parse_raw_data ( const uint8_t* _data ); | ||
98 | |||
99 | #endif /* _MSI_HEADER_ */ | ||
diff --git a/toxmsi/toxmsi_message.c b/toxmsi/toxmsi_message.c deleted file mode 100644 index 72d7ee01..00000000 --- a/toxmsi/toxmsi_message.c +++ /dev/null | |||
@@ -1,267 +0,0 @@ | |||
1 | #ifdef HAVE_CONFIG_H | ||
2 | #include "config.h" | ||
3 | #endif /* HAVE_CONFIG_H */ | ||
4 | |||
5 | #include "toxmsi_message.h" | ||
6 | #include <stdlib.h> | ||
7 | #include <string.h> | ||
8 | #include "../toxrtp/toxrtp_helper.h" | ||
9 | #include <assert.h> | ||
10 | #include <stdlib.h> | ||
11 | |||
12 | #define ALLOCATE_HEADER(_header_type, _var, _m_header_value) \ | ||
13 | _var = calloc( sizeof(_header_type), 1 ); \ | ||
14 | assert(_var); \ | ||
15 | _var->_header_value = t_strallcpy((const uint8_t*)_m_header_value); | ||
16 | |||
17 | #define DEALLOCATE_HEADER(_header) \ | ||
18 | if ( _header && _header->_header_value ) { \ | ||
19 | free( _header->_header_value ); \ | ||
20 | free( _header ); } | ||
21 | |||
22 | #define SET_HEADER(_header_type, _var, _m_header_value) \ | ||
23 | if ( _var ){ \ | ||
24 | free(_var->_header_value); \ | ||
25 | free(_var);} \ | ||
26 | ALLOCATE_HEADER( _header_type, _var, _m_header_value ) | ||
27 | |||
28 | |||
29 | /* Sets empty message | ||
30 | */ | ||
31 | void set_msg ( msi_msg_t* _msg ) | ||
32 | { | ||
33 | _msg->_call_type = NULL; | ||
34 | _msg->_version = NULL; | ||
35 | _msg->_request = NULL; | ||
36 | _msg->_response = NULL; | ||
37 | _msg->_friend_id = NULL; | ||
38 | _msg->_user_agent = NULL; | ||
39 | _msg->_call_id = NULL; | ||
40 | _msg->_reason = NULL; | ||
41 | _msg->_info = NULL; | ||
42 | _msg->_next = NULL; | ||
43 | _msg->_headers = NULL; | ||
44 | } | ||
45 | |||
46 | void msi_free_msg ( msi_msg_t* _msg ) | ||
47 | { | ||
48 | assert(_msg); | ||
49 | |||
50 | DEALLOCATE_HEADER(_msg->_call_type); | ||
51 | DEALLOCATE_HEADER(_msg->_friend_id); | ||
52 | DEALLOCATE_HEADER(_msg->_request); | ||
53 | DEALLOCATE_HEADER(_msg->_response); | ||
54 | DEALLOCATE_HEADER(_msg->_user_agent); | ||
55 | DEALLOCATE_HEADER(_msg->_version); | ||
56 | DEALLOCATE_HEADER(_msg->_info); | ||
57 | DEALLOCATE_HEADER(_msg->_reason); | ||
58 | DEALLOCATE_HEADER(_msg->_call_id); | ||
59 | |||
60 | free(_msg); | ||
61 | } | ||
62 | |||
63 | void append_header_to_string ( uint8_t* _dest, const uint8_t* _header_field, const uint8_t* _header_value ) | ||
64 | { | ||
65 | assert(_dest); | ||
66 | assert(_header_value); | ||
67 | assert(_header_field); | ||
68 | |||
69 | size_t _dest_len = t_memlen(_dest); | ||
70 | |||
71 | uint8_t* _storage_iterator = _dest + _dest_len; | ||
72 | const uint8_t* _header_fit = _header_field; | ||
73 | const uint8_t* _header_val = _header_value; | ||
74 | const uint8_t* _term_it = (const uint8_t*) _RAW_TERMINATOR; | ||
75 | |||
76 | while ( *_header_fit ){ | ||
77 | *_storage_iterator = *_header_fit; | ||
78 | ++_header_fit; | ||
79 | ++_storage_iterator; | ||
80 | } | ||
81 | |||
82 | *_storage_iterator = ' '; /* place space */ | ||
83 | ++_storage_iterator; | ||
84 | |||
85 | while ( *_header_val ){ | ||
86 | *_storage_iterator = *_header_val; | ||
87 | ++_header_val; | ||
88 | ++_storage_iterator; | ||
89 | } | ||
90 | |||
91 | while ( *_term_it ){ | ||
92 | *_storage_iterator = *_term_it; | ||
93 | ++_term_it; | ||
94 | ++_storage_iterator; | ||
95 | } | ||
96 | } | ||
97 | |||
98 | msi_msg_t* msi_parse_msg ( const uint8_t* _data ) | ||
99 | { | ||
100 | assert(_data); | ||
101 | |||
102 | msi_msg_t* _retu = calloc ( sizeof ( msi_msg_t ), 1 ); | ||
103 | assert(_retu); | ||
104 | |||
105 | set_msg(_retu); | ||
106 | |||
107 | _retu->_headers = msi_parse_raw_data ( _data ); | ||
108 | |||
109 | if ( msi_parse_headers (_retu) == FAILURE ) { | ||
110 | msi_free_msg(_retu); | ||
111 | return NULL; | ||
112 | } | ||
113 | |||
114 | if ( !_retu->_version || strcmp((const char*)_retu->_version->_header_value, VERSION_STRING) != 0 ){ | ||
115 | msi_free_msg(_retu); | ||
116 | return NULL; | ||
117 | } | ||
118 | |||
119 | return _retu; | ||
120 | } | ||
121 | |||
122 | |||
123 | uint8_t* msi_msg_to_string ( msi_msg_t* _msg ) | ||
124 | { | ||
125 | assert(_msg); | ||
126 | |||
127 | uint8_t* _retu = calloc(sizeof(uint8_t), MSI_MAXMSG_SIZE ); | ||
128 | assert(_retu); | ||
129 | |||
130 | t_memset(_retu, '\0', MSI_MAXMSG_SIZE); | ||
131 | |||
132 | if ( _msg->_version ){ | ||
133 | append_header_to_string(_retu, (const uint8_t*)_VERSION_FIELD, _msg->_version->_header_value); | ||
134 | } | ||
135 | |||
136 | if ( _msg->_request ){ | ||
137 | append_header_to_string(_retu, (const uint8_t*)_REQUEST_FIELD, _msg->_request->_header_value); | ||
138 | } | ||
139 | |||
140 | if ( _msg->_response ){ | ||
141 | append_header_to_string(_retu, (const uint8_t*)_RESPONSE_FIELD, _msg->_response->_header_value); | ||
142 | } | ||
143 | |||
144 | if ( _msg->_friend_id ){ | ||
145 | append_header_to_string(_retu, (const uint8_t*)_FRIENDID_FIELD, _msg->_friend_id->_header_value); | ||
146 | } | ||
147 | |||
148 | if ( _msg->_call_type ){ | ||
149 | append_header_to_string(_retu, (const uint8_t*)_CALLTYPE_FIELD, _msg->_call_type->_header_value); | ||
150 | } | ||
151 | |||
152 | if ( _msg->_user_agent ){ | ||
153 | append_header_to_string(_retu, (const uint8_t*)_USERAGENT_FIELD, _msg->_user_agent->_header_value); | ||
154 | } | ||
155 | |||
156 | if ( _msg->_info ){ | ||
157 | append_header_to_string(_retu, (const uint8_t*)_INFO_FIELD, _msg->_info->_header_value); | ||
158 | } | ||
159 | |||
160 | if ( _msg->_call_id ){ | ||
161 | append_header_to_string(_retu, (const uint8_t*)_CALL_ID_FIELD, _msg->_call_id->_header_value); | ||
162 | } | ||
163 | |||
164 | if ( _msg->_reason ){ | ||
165 | append_header_to_string(_retu, (const uint8_t*)_REASON_FIELD, _msg->_reason->_header_value); | ||
166 | } | ||
167 | |||
168 | return _retu; | ||
169 | } | ||
170 | |||
171 | msi_msg_t* msi_msg_new ( uint8_t _type, const uint8_t* _typeid ) | ||
172 | { | ||
173 | msi_msg_t* _retu = calloc ( sizeof ( msi_msg_t ), 1 ); | ||
174 | assert(_retu); | ||
175 | |||
176 | set_msg(_retu); | ||
177 | |||
178 | if ( _type == TYPE_REQUEST ){ | ||
179 | ALLOCATE_HEADER( msi_header_request_t, _retu->_request, _typeid ) | ||
180 | _retu->_response = NULL; | ||
181 | |||
182 | } else if ( _type == TYPE_RESPONSE ) { | ||
183 | ALLOCATE_HEADER( msi_header_response_t, _retu->_response, _typeid ) | ||
184 | _retu->_request = NULL; | ||
185 | |||
186 | } else { | ||
187 | msi_free_msg(_retu); | ||
188 | return NULL; | ||
189 | } | ||
190 | |||
191 | |||
192 | ALLOCATE_HEADER( msi_header_version_t, _retu->_version, VERSION_STRING) | ||
193 | |||
194 | _retu->_friend_id = NULL; | ||
195 | _retu->_call_type = NULL; | ||
196 | _retu->_user_agent = NULL; | ||
197 | _retu->_info = NULL; | ||
198 | |||
199 | _retu->_next = NULL; | ||
200 | |||
201 | return _retu; | ||
202 | } | ||
203 | |||
204 | uint8_t* msi_genterate_call_id ( uint8_t* _storage, size_t _len ) | ||
205 | { | ||
206 | assert(_storage); | ||
207 | |||
208 | static const char _alphanum[] = | ||
209 | "0123456789" | ||
210 | "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||
211 | "abcdefghijklmnopqrstuvwxyz"; /* avoids warning */ | ||
212 | |||
213 | uint8_t _val = 0; | ||
214 | size_t _it; | ||
215 | |||
216 | /* Generate random values 1-255 */ | ||
217 | for ( _it = 0; _it < _len; _it ++ ) { | ||
218 | while ( !_val ) _val = (uint8_t) _alphanum[ t_random(61) ]; | ||
219 | |||
220 | _storage[_it] = _val; | ||
221 | _val = 0; | ||
222 | } | ||
223 | |||
224 | return _storage; | ||
225 | } | ||
226 | |||
227 | /* HEADER SETTING | ||
228 | */ | ||
229 | |||
230 | void msi_msg_set_call_type ( msi_msg_t* _msg, const uint8_t* _header_field ) | ||
231 | { | ||
232 | assert(_msg); | ||
233 | assert(_header_field); | ||
234 | |||
235 | SET_HEADER(msi_header_call_type_t, _msg->_call_type, _header_field) | ||
236 | } | ||
237 | void msi_msg_set_user_agent ( msi_msg_t* _msg, const uint8_t* _header_field ) | ||
238 | { | ||
239 | assert(_msg); | ||
240 | assert(_header_field); | ||
241 | |||
242 | SET_HEADER(msi_header_user_agent_t, _msg->_user_agent, _header_field) | ||
243 | } | ||
244 | void msi_msg_set_friend_id ( msi_msg_t* _msg, const uint8_t* _header_field ) | ||
245 | { | ||
246 | assert(_msg); | ||
247 | assert(_header_field); | ||
248 | |||
249 | SET_HEADER(msi_header_friendid_t, _msg->_friend_id, _header_field) | ||
250 | } | ||
251 | void msi_msg_set_info ( msi_msg_t* _msg, const uint8_t* _header_field ) | ||
252 | { | ||
253 | } | ||
254 | void msi_msg_set_reason ( msi_msg_t* _msg, const uint8_t* _header_field ) | ||
255 | { | ||
256 | assert(_msg); | ||
257 | assert(_header_field); | ||
258 | |||
259 | SET_HEADER(msi_header_reason_t, _msg->_reason, _header_field) | ||
260 | } | ||
261 | void msi_msg_set_call_id ( msi_msg_t* _msg, const uint8_t* _header_field ) | ||
262 | { | ||
263 | assert(_msg); | ||
264 | assert(_header_field); | ||
265 | |||
266 | SET_HEADER(msi_header_call_id_t, _msg->_call_id, _header_field) | ||
267 | } | ||
diff --git a/toxmsi/toxmsi_message.h b/toxmsi/toxmsi_message.h deleted file mode 100644 index 87dfccc2..00000000 --- a/toxmsi/toxmsi_message.h +++ /dev/null | |||
@@ -1,120 +0,0 @@ | |||
1 | #ifndef _MSI_MESSAGE_H_ | ||
2 | #define _MSI_MESSAGE_H_ | ||
3 | |||
4 | #ifdef HAVE_CONFIG_H | ||
5 | #include "config.h" | ||
6 | #endif /* HAVE_CONFIG_H */ | ||
7 | |||
8 | #include <inttypes.h> | ||
9 | #include "../toxcore/network.h" | ||
10 | #include "../toxcore/tox.h" | ||
11 | |||
12 | #include "toxmsi_header.h" | ||
13 | |||
14 | #define TYPE_REQUEST 1 | ||
15 | #define TYPE_RESPONSE 2 | ||
16 | |||
17 | #define VERSION_STRING "0.2.2" | ||
18 | |||
19 | #define MSI_MAXMSG_SIZE 65535 | ||
20 | |||
21 | typedef enum { | ||
22 | _invite, | ||
23 | _start, | ||
24 | _cancel, | ||
25 | _reject, | ||
26 | _end, | ||
27 | |||
28 | } msi_request_t; | ||
29 | |||
30 | static inline const uint8_t *stringify_request(msi_request_t _request) | ||
31 | { | ||
32 | static const uint8_t* strings[] = | ||
33 | { | ||
34 | (uint8_t*)"INVITE", | ||
35 | (uint8_t*)"START", | ||
36 | (uint8_t*)"CANCEL", | ||
37 | (uint8_t*)"REJECT", | ||
38 | (uint8_t*)"END" | ||
39 | }; | ||
40 | |||
41 | return strings[_request]; | ||
42 | } | ||
43 | |||
44 | typedef enum { | ||
45 | _trying, | ||
46 | _ringing, | ||
47 | _starting, | ||
48 | _ending, | ||
49 | _error | ||
50 | |||
51 | } msi_response_t; | ||
52 | |||
53 | static inline const uint8_t *stringify_response(msi_response_t _response) | ||
54 | { | ||
55 | static const uint8_t* strings[] = | ||
56 | { | ||
57 | (uint8_t*)"trying", | ||
58 | (uint8_t*)"ringing", | ||
59 | (uint8_t*)"starting", | ||
60 | (uint8_t*)"ending", | ||
61 | (uint8_t*)"error" | ||
62 | }; | ||
63 | |||
64 | return strings[_response]; | ||
65 | } | ||
66 | |||
67 | |||
68 | typedef struct msi_msg_s { | ||
69 | /* This is the header list which contains unparsed headers */ | ||
70 | msi_header_t* _headers; | ||
71 | |||
72 | /* Headers parsed */ | ||
73 | msi_header_version_t* _version; | ||
74 | msi_header_request_t* _request; | ||
75 | msi_header_response_t* _response; | ||
76 | msi_header_friendid_t* _friend_id; | ||
77 | msi_header_call_type_t* _call_type; | ||
78 | msi_header_user_agent_t* _user_agent; | ||
79 | msi_header_info_t* _info; | ||
80 | msi_header_reason_t* _reason; | ||
81 | msi_header_call_id_t* _call_id; | ||
82 | |||
83 | /* Pointer to next member since it's list duuh */ | ||
84 | struct msi_msg_s* _next; | ||
85 | |||
86 | } msi_msg_t; | ||
87 | |||
88 | |||
89 | /* | ||
90 | * Parse data received from socket | ||
91 | */ | ||
92 | msi_msg_t* msi_parse_msg ( const uint8_t* _data ); | ||
93 | |||
94 | /* | ||
95 | * Make new message. Arguments: _type: (request, response); _type_field ( value ) | ||
96 | */ | ||
97 | msi_msg_t* msi_msg_new ( uint8_t _type, const uint8_t* _type_field ); | ||
98 | |||
99 | /* Header setting */ | ||
100 | void msi_msg_set_call_type ( msi_msg_t* _msg, const uint8_t* _header_field ); | ||
101 | void msi_msg_set_user_agent ( msi_msg_t* _msg, const uint8_t* _header_field ); | ||
102 | void msi_msg_set_friend_id ( msi_msg_t* _msg, const uint8_t* _header_field ); | ||
103 | void msi_msg_set_info ( msi_msg_t* _msg, const uint8_t* _header_field ); | ||
104 | void msi_msg_set_reason ( msi_msg_t* _msg, const uint8_t* _header_field ); | ||
105 | void msi_msg_set_call_id ( msi_msg_t* _msg, const uint8_t* _header_field ); | ||
106 | |||
107 | |||
108 | uint8_t* msi_genterate_call_id ( uint8_t* _storage, size_t _len ); | ||
109 | /* | ||
110 | * Parses message struct to string. | ||
111 | * Allocates memory so don't forget to free it | ||
112 | */ | ||
113 | uint8_t* msi_msg_to_string ( msi_msg_t* _msg ); | ||
114 | |||
115 | /* | ||
116 | * msi_msg_s struct deallocator | ||
117 | */ | ||
118 | void msi_free_msg ( msi_msg_t* _msg ); | ||
119 | |||
120 | #endif /* _MSI_MESSAGE_H_ */ | ||
diff --git a/toxrtp/Makefile.inc b/toxrtp/Makefile.inc deleted file mode 100644 index 801a7fd3..00000000 --- a/toxrtp/Makefile.inc +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | if BUILD_AV | ||
2 | |||
3 | lib_LTLIBRARIES += libtoxrtp.la | ||
4 | |||
5 | libtoxrtp_la_include_HEADERS = \ | ||
6 | ../toxrtp/toxrtp.h | ||
7 | |||
8 | libtoxrtp_la_includedir = $(includedir)/tox | ||
9 | |||
10 | libtoxrtp_la_SOURCES = ../toxrtp/toxrtp_error.h \ | ||
11 | ../toxrtp/toxrtp_error.c \ | ||
12 | ../toxrtp/toxrtp_error_id.h \ | ||
13 | ../toxrtp/toxrtp_helper.h \ | ||
14 | ../toxrtp/toxrtp_helper.c \ | ||
15 | ../toxrtp/toxrtp.h \ | ||
16 | ../toxrtp/toxrtp.c \ | ||
17 | ../toxrtp/toxrtp_message.h \ | ||
18 | ../toxrtp/toxrtp_message.c \ | ||
19 | ../toxcore/network.h \ | ||
20 | ../toxcore/network.c \ | ||
21 | ../toxcore/util.h \ | ||
22 | ../toxcore/util.c | ||
23 | |||
24 | libtoxrtp_la_CFLAGS = -I../toxcore \ | ||
25 | -I../toxrtp \ | ||
26 | $(NACL_CFLAGS) | ||
27 | |||
28 | libtoxrtp_la_LDFLAGS = $(TOXRTP_LT_LDFLAGS) \ | ||
29 | $(NACL_LDFLAGS) \ | ||
30 | $(EXTRA_LT_LDFLAGS) | ||
31 | |||
32 | libtoxrtp_la_LIBS = $(NACL_LIBS) | ||
33 | |||
34 | endif | ||
diff --git a/toxrtp/tests/Makefile.inc b/toxrtp/tests/Makefile.inc deleted file mode 100644 index 8d1c8b69..00000000 --- a/toxrtp/tests/Makefile.inc +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | |||
diff --git a/toxrtp/tests/test_bidirect.c b/toxrtp/tests/test_bidirect.c deleted file mode 100644 index b5a0899e..00000000 --- a/toxrtp/tests/test_bidirect.c +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | #define _BSD_SOURCE | ||
2 | |||
3 | #include "../toxrtp.h" | ||
4 | #include "../toxrtp_message.h" | ||
5 | #include <stdio.h> | ||
6 | #include <stdlib.h> | ||
7 | #include <string.h> | ||
8 | #include <utime.h> | ||
9 | #include <assert.h> | ||
10 | |||
11 | #include "test_helper.h" | ||
12 | #include "../../toxcore/tox.h" | ||
13 | |||
14 | #ifdef _CT_BIDIRECT | ||
15 | |||
16 | int _print_help( const char* name ) | ||
17 | { | ||
18 | char* _help = malloc( 300 ); | ||
19 | memset(_help, '\0', 300); | ||
20 | |||
21 | strcat(_help, " Usage: "); | ||
22 | strcat(_help, name); | ||
23 | strcat(_help, "\n -d IP ( destination )\n" | ||
24 | " -p PORT ( dest Port )\n" | ||
25 | " -l PORT ( listen Port ) \n"); | ||
26 | |||
27 | puts ( _help ); | ||
28 | |||
29 | free(_help); | ||
30 | return FAILURE; | ||
31 | } | ||
32 | |||
33 | int main( int argc, char* argv[] ) | ||
34 | { | ||
35 | int status; | ||
36 | tox_IP_Port Ip_port; | ||
37 | const char* ip, *psend, *plisten; | ||
38 | uint16_t port_send, port_listen; | ||
39 | const uint8_t* test_bytes = "0123456789012345678901234567890123456789012345678901234567890123456789" | ||
40 | "0123456789012345678901234567890123456789012345678901234567890123456789" | ||
41 | "0123456789012345678901234567890123456789012345678901234567890123456789" | ||
42 | "0123456789012345678901234567890123456789012345678901234567890123456789"; | ||
43 | |||
44 | |||
45 | rtp_session_t* _m_session; | ||
46 | rtp_msg_t *_m_msg_R, *_m_msg_S; | ||
47 | arg_t* _list = parse_args ( argc, argv ); | ||
48 | |||
49 | ip = find_arg_duble(_list, "-d"); | ||
50 | psend = find_arg_duble(_list, "-p"); | ||
51 | plisten = find_arg_duble(_list, "-l"); | ||
52 | |||
53 | if ( !ip || !plisten || !psend ) | ||
54 | return _print_help(argv[0]); | ||
55 | |||
56 | port_send = atoi(psend); | ||
57 | port_listen = atoi(plisten); | ||
58 | |||
59 | IP_Port local, remote; | ||
60 | |||
61 | /* | ||
62 | * This is the Local ip. We initiate networking on | ||
63 | * this value for it's the local one. To make stuff simpler we receive over this value | ||
64 | * and send on the other one ( see remote ) | ||
65 | */ | ||
66 | local.ip.i = htonl(INADDR_ANY); | ||
67 | local.port = port_listen; | ||
68 | Networking_Core* _networking = new_networking(local.ip, port_listen); | ||
69 | |||
70 | if ( !_networking ) | ||
71 | return FAILURE; | ||
72 | |||
73 | int _socket = _networking->sock; | ||
74 | /* | ||
75 | * Now this is the remote. It's used by rtp_session_t to determine the receivers ip etc. | ||
76 | */ | ||
77 | t_setipport ( ip, port_send, &remote ); | ||
78 | _m_session = rtp_init_session(-1, -1); | ||
79 | rtp_add_receiver( _m_session, &remote ); | ||
80 | |||
81 | /* Now let's start our main loop in both recv and send mode */ | ||
82 | |||
83 | for ( ;; ) | ||
84 | { | ||
85 | /* | ||
86 | * This part checks for received messages and if gotten one | ||
87 | * display 'Received msg!' indicator and free message | ||
88 | */ | ||
89 | _m_msg_R = rtp_recv_msg ( _m_session ); | ||
90 | |||
91 | if ( _m_msg_R ) { | ||
92 | puts ( "Received msg!" ); | ||
93 | rtp_free_msg(_m_session, _m_msg_R); | ||
94 | } | ||
95 | /* -------------------- */ | ||
96 | |||
97 | /* | ||
98 | * This one makes a test msg and sends that message to the 'remote' | ||
99 | */ | ||
100 | _m_msg_S = rtp_msg_new ( _m_session, test_bytes, 280 ) ; | ||
101 | rtp_send_msg ( _m_session, _m_msg_S, _socket ); | ||
102 | usleep ( 10000 ); | ||
103 | /* -------------------- */ | ||
104 | } | ||
105 | |||
106 | return SUCCESS; | ||
107 | } | ||
108 | |||
109 | #endif /* _CT_BIDIRECT */ | ||
diff --git a/toxrtp/tests/test_headers.c b/toxrtp/tests/test_headers.c deleted file mode 100644 index be3f1375..00000000 --- a/toxrtp/tests/test_headers.c +++ /dev/null | |||
@@ -1,316 +0,0 @@ | |||
1 | /* test_headers.c | ||
2 | * | ||
3 | * Tests header parsing. You probably won't need this. !Red! | ||
4 | * | ||
5 | * | ||
6 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
7 | * | ||
8 | * This file is part of Tox. | ||
9 | * | ||
10 | * Tox is free software: you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation, either version 3 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * Tox is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #include "test_helper.h" | ||
26 | #include "../toxrtp.h" | ||
27 | #include "../toxrtp_message.h" | ||
28 | |||
29 | #include <stdio.h> | ||
30 | #include <stdlib.h> | ||
31 | #include <string.h> | ||
32 | #include <utime.h> | ||
33 | #include <assert.h> | ||
34 | #include "../toxrtp_error_id.h" | ||
35 | |||
36 | #define _CT_HEADERS_ | ||
37 | |||
38 | #ifdef _CT_HEADERS | ||
39 | |||
40 | int _socket; | ||
41 | pthread_mutex_t _mutex; | ||
42 | |||
43 | int print_help() | ||
44 | { | ||
45 | puts ( | ||
46 | " Usage: Tuxrtp [-s (send mode) -d IP ( destination ) -p PORT ( dest Port )] \n" | ||
47 | " [-r ( recv mode ) ]" | ||
48 | ); | ||
49 | return FAILURE; | ||
50 | } | ||
51 | |||
52 | void print_session_stats ( rtp_session_t* _m_session ) | ||
53 | { | ||
54 | printf | ||
55 | ( | ||
56 | "Session test:\n" | ||
57 | "\tPackets sent:%d\n" | ||
58 | "\tPackets recv:%d\n\n" | ||
59 | "\tBytes sent:%d\n" | ||
60 | "\tBytes recv:%d\n\n" | ||
61 | "\tHeader CCSRs:%d\n" | ||
62 | , | ||
63 | _m_session->_packets_sent, | ||
64 | _m_session->_packets_recv, | ||
65 | _m_session->_bytes_sent, | ||
66 | _m_session->_bytes_recv, | ||
67 | _m_session->_cc | ||
68 | ); | ||
69 | |||
70 | uint8_t i; | ||
71 | for ( i = 0; i < _m_session->_cc; i++ ) { | ||
72 | printf ( | ||
73 | "\t%d > :%d\n", i, _m_session->_csrc[i] | ||
74 | ); | ||
75 | } | ||
76 | } | ||
77 | |||
78 | void print_header_info ( rtp_header_t* _header ) | ||
79 | { | ||
80 | printf | ||
81 | ( | ||
82 | "Header info:\n" | ||
83 | "\tVersion :%d\n" | ||
84 | "\tPadding :%d\n" | ||
85 | "\tExtension :%d\n" | ||
86 | "\tCSRC count :%d\n" | ||
87 | "\tPayload type :%d\n" | ||
88 | "\tMarker :%d\n\n" | ||
89 | |||
90 | "\tSSrc :%d\n" | ||
91 | "\tSequence num :%d\n" | ||
92 | "\tLenght: :%d\n" | ||
93 | "\tCSRC's:\n" | ||
94 | , | ||
95 | rtp_header_get_flag_version ( _header ), | ||
96 | rtp_header_get_flag_padding ( _header ), | ||
97 | rtp_header_get_flag_extension ( _header ), | ||
98 | rtp_header_get_flag_CSRC_count ( _header ), | ||
99 | rtp_header_get_setting_payload_type ( _header ), | ||
100 | rtp_header_get_setting_marker ( _header ), | ||
101 | |||
102 | _header->_ssrc, | ||
103 | _header->_sequence_number, | ||
104 | _header->_length | ||
105 | ); | ||
106 | |||
107 | |||
108 | uint8_t i; | ||
109 | for ( i = 0; i < rtp_header_get_flag_CSRC_count ( _header ); i++ ) { | ||
110 | printf ( | ||
111 | "\t%d > :%d\n", i, _header->_csrc[i] | ||
112 | ); | ||
113 | } | ||
114 | |||
115 | puts ( "\n" ); | ||
116 | } | ||
117 | |||
118 | void print_ext_header_info(rtp_ext_header_t* _ext_header) | ||
119 | { | ||
120 | printf | ||
121 | ( | ||
122 | "External Header info: \n" | ||
123 | "\tLenght :%d\n" | ||
124 | "\tID :%d\n" | ||
125 | "\tValue H :%d\n" | ||
126 | "\tValue W :%d\n\n", | ||
127 | _ext_header->_ext_len, | ||
128 | _ext_header->_ext_type, | ||
129 | rtp_get_resolution_marking_height(_ext_header, 0), | ||
130 | rtp_get_resolution_marking_width(_ext_header, 0) | ||
131 | ); | ||
132 | } | ||
133 | |||
134 | int rtp_handlepacket ( rtp_session_t* _session, rtp_msg_t* _msg ) | ||
135 | { | ||
136 | if ( !_msg ) | ||
137 | return FAILURE; | ||
138 | |||
139 | if ( rtp_check_late_message(_session, _msg) < 0 ) { | ||
140 | rtp_register_msg(_session, _msg); | ||
141 | } | ||
142 | |||
143 | if ( _session->_last_msg ) { | ||
144 | _session->_last_msg->_next = _msg; | ||
145 | _session->_last_msg = _msg; | ||
146 | } else { | ||
147 | _session->_last_msg = _session->_oldest_msg = _msg; | ||
148 | } | ||
149 | |||
150 | |||
151 | return SUCCESS; | ||
152 | } | ||
153 | |||
154 | void* receivepacket_callback(void* _p_session) | ||
155 | { | ||
156 | rtp_msg_t* _msg; | ||
157 | rtp_session_t* _session = _p_session; | ||
158 | |||
159 | uint32_t _bytes; | ||
160 | tox_IP_Port _from; | ||
161 | uint8_t _socket_data[MAX_UDP_PACKET_SIZE]; | ||
162 | |||
163 | int _m_socket = _socket; | ||
164 | |||
165 | while ( 1 ) | ||
166 | { | ||
167 | int _status = receivepacket ( _m_socket, &_from, _socket_data, &_bytes ); | ||
168 | |||
169 | if ( _status == FAILURE ) { /* nothing recved */ | ||
170 | usleep(1000); | ||
171 | continue; | ||
172 | } | ||
173 | |||
174 | pthread_mutex_lock ( &_mutex ); | ||
175 | |||
176 | _msg = rtp_msg_parse ( NULL, _socket_data, _bytes ); | ||
177 | rtp_handlepacket(_session, _msg); | ||
178 | |||
179 | pthread_mutex_unlock ( &_mutex ); | ||
180 | } | ||
181 | |||
182 | pthread_exit(NULL); | ||
183 | } | ||
184 | |||
185 | int main ( int argc, char* argv[] ) | ||
186 | { | ||
187 | arg_t* _list = parse_args ( argc, argv ); | ||
188 | |||
189 | if ( _list == NULL ) { /* failed */ | ||
190 | return print_help(); | ||
191 | } | ||
192 | |||
193 | pthread_mutex_init ( &_mutex, NULL ); | ||
194 | |||
195 | int status; | ||
196 | IP_Port Ip_port; | ||
197 | const char* ip; | ||
198 | uint16_t port; | ||
199 | |||
200 | |||
201 | const uint8_t* test_bytes [300]; | ||
202 | memset(test_bytes, 'a', 300); | ||
203 | |||
204 | rtp_session_t* _m_session; | ||
205 | rtp_msg_t* _m_msg; | ||
206 | |||
207 | if ( find_arg_simple ( _list, "-r" ) != FAILURE ) { /* Server mode */ | ||
208 | |||
209 | IP_Port LOCAL_IP; /* since you need at least 1 recv-er */ | ||
210 | LOCAL_IP.ip.i = htonl(INADDR_ANY); | ||
211 | LOCAL_IP.port = RTP_PORT; | ||
212 | LOCAL_IP.padding = -1; | ||
213 | |||
214 | _m_session = rtp_init_session ( -1, -1 ); | ||
215 | Networking_Core* _networking = new_networking(LOCAL_IP.ip, RTP_PORT_LISTEN); | ||
216 | _socket = _networking->sock; | ||
217 | |||
218 | |||
219 | if ( !_networking ){ | ||
220 | pthread_mutex_destroy ( &_mutex ); | ||
221 | return FAILURE; | ||
222 | } | ||
223 | |||
224 | int _socket = _networking->sock; | ||
225 | |||
226 | if ( status < 0 ) { | ||
227 | pthread_mutex_destroy ( &_mutex ); | ||
228 | return FAILURE; | ||
229 | } | ||
230 | /* -- start in recv mode, get 1 message and then analyze it -- */ | ||
231 | pthread_t _tid; | ||
232 | RUN_IN_THREAD(receivepacket_callback, _tid, _m_session) | ||
233 | |||
234 | for ( ; ; ) { /* Recv for x seconds */ | ||
235 | _m_msg = rtp_recv_msg ( _m_session ); | ||
236 | |||
237 | /* _m_msg = rtp_session_get_message_queded ( _m_session ); DEPRECATED */ | ||
238 | if ( _m_msg ) { | ||
239 | /*rtp_free_msg(_m_session, _m_msg); | ||
240 | _m_msg = NULL;*/ | ||
241 | printf("Timestamp: %d\n", _m_msg->_header->_timestamp); | ||
242 | } | ||
243 | |||
244 | usleep ( 10000 ); | ||
245 | } | ||
246 | |||
247 | if ( _m_msg->_header ) { | ||
248 | rtp_header_print ( _m_msg->_header ); | ||
249 | } | ||
250 | if ( _m_msg->_ext_header ){ | ||
251 | print_ext_header_info(_m_msg->_ext_header); | ||
252 | } | ||
253 | |||
254 | //print_session_stats ( _m_session ); | ||
255 | |||
256 | |||
257 | //printf ( "Payload: ( %d ) \n%s\n", _m_msg->_length, _m_msg->_data ); | ||
258 | |||
259 | |||
260 | } else if ( find_arg_simple ( _list, "-s" ) != FAILURE ) { | ||
261 | ip = find_arg_duble ( _list, "-d" ); | ||
262 | |||
263 | if ( ip == NULL ) { | ||
264 | pthread_mutex_destroy ( &_mutex ); | ||
265 | return FAILURE; | ||
266 | } | ||
267 | |||
268 | const char* _port = find_arg_duble ( _list, "-p" ); | ||
269 | |||
270 | if ( _port != NULL ) { | ||
271 | port = atoi ( _port ); | ||
272 | } | ||
273 | |||
274 | t_setipport ( ip, port, &Ip_port ); | ||
275 | printf ( "Remote: %s:%d\n", ip, port ); | ||
276 | |||
277 | Networking_Core* _networking = new_networking(Ip_port.ip, RTP_PORT); | ||
278 | |||
279 | if ( !_networking ){ | ||
280 | pthread_mutex_destroy ( &_mutex ); | ||
281 | return FAILURE; | ||
282 | } | ||
283 | |||
284 | int _socket = _networking->sock; | ||
285 | |||
286 | _m_session = rtp_init_session ( -1, -1 ); | ||
287 | rtp_add_receiver( _m_session, &Ip_port ); | ||
288 | //rtp_add_resolution_marking(_m_session, 1920, 1080); | ||
289 | //rtp_add_framerate_marking(_m_session, 1000); | ||
290 | |||
291 | puts ( "Now sending payload!\n" ); | ||
292 | uint16_t _first_sequ = _m_session->_sequence_number; | ||
293 | |||
294 | /* use already defined buffer lenght */ | ||
295 | while ( 1 ){ | ||
296 | _m_msg = rtp_msg_new ( _m_session, test_bytes, 300 ); | ||
297 | rtp_send_msg ( _m_session, _m_msg, _socket ); | ||
298 | usleep(10000); | ||
299 | } | ||
300 | |||
301 | if ( _m_session->_last_error ) { | ||
302 | puts ( _m_session->_last_error ); | ||
303 | } | ||
304 | |||
305 | return rtp_terminate_session(_m_session); | ||
306 | |||
307 | } else { | ||
308 | pthread_mutex_destroy ( &_mutex ); | ||
309 | return FAILURE; | ||
310 | } | ||
311 | pthread_mutex_destroy ( &_mutex ); | ||
312 | |||
313 | return SUCCESS; | ||
314 | } | ||
315 | |||
316 | #endif /* _CT_HEADERS */ | ||
diff --git a/toxrtp/tests/test_helper.c b/toxrtp/tests/test_helper.c deleted file mode 100644 index 526b6b38..00000000 --- a/toxrtp/tests/test_helper.c +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /* test_helper.c | ||
2 | * | ||
3 | * Tests support. !Red! | ||
4 | * | ||
5 | * | ||
6 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
7 | * | ||
8 | * This file is part of Tox. | ||
9 | * | ||
10 | * Tox is free software: you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation, either version 3 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * Tox is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #include "test_helper.h" | ||
26 | |||
27 | #include <string.h> | ||
28 | #include <stdlib.h> | ||
29 | |||
30 | arg_t* parse_args ( int argc, char* argv[] ) | ||
31 | { | ||
32 | arg_t* _list = calloc(sizeof(arg_t), 1); | ||
33 | _list->next = _list->prev = NULL; | ||
34 | |||
35 | arg_t* it = _list; | ||
36 | |||
37 | size_t val; | ||
38 | for ( val = 0; val < argc; val ++ ) { | ||
39 | it->value = argv[val]; | ||
40 | |||
41 | if ( val < argc - 1 ) { /* just about to end */ | ||
42 | it->next = calloc(sizeof(arg_t), 1); | ||
43 | it->next->prev = it; | ||
44 | it = it->next; | ||
45 | it->next = NULL; | ||
46 | } | ||
47 | } | ||
48 | |||
49 | return _list; | ||
50 | } | ||
51 | |||
52 | int find_arg_simple ( arg_t* _head, const char* _id ) | ||
53 | { | ||
54 | arg_t* it = _head; | ||
55 | |||
56 | int i; | ||
57 | for ( i = 1; it != NULL; it = it->next ) { | ||
58 | if ( strcmp ( _id, it->value ) == 0 ) { | ||
59 | return i; | ||
60 | } | ||
61 | |||
62 | i++; | ||
63 | } | ||
64 | |||
65 | return FAILURE; | ||
66 | } | ||
67 | |||
68 | const char* find_arg_duble ( arg_t* _head, const char* _id ) | ||
69 | { | ||
70 | arg_t* _it; | ||
71 | for ( _it = _head; _it != NULL; _it = _it->next ) { | ||
72 | if ( strcmp ( _id, _it->value ) == 0 ) { | ||
73 | if ( _it->next && _it->next->value[0] != '-' ) { /* exclude option */ | ||
74 | return _it->next->value; | ||
75 | } else { | ||
76 | return NULL; | ||
77 | } | ||
78 | } | ||
79 | } | ||
80 | |||
81 | return NULL; | ||
82 | } | ||
83 | |||
diff --git a/toxrtp/tests/test_helper.h b/toxrtp/tests/test_helper.h deleted file mode 100644 index de654743..00000000 --- a/toxrtp/tests/test_helper.h +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | /* test_helper.h | ||
2 | * | ||
3 | * Tests support. !Red! | ||
4 | * | ||
5 | * | ||
6 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
7 | * | ||
8 | * This file is part of Tox. | ||
9 | * | ||
10 | * Tox is free software: you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation, either version 3 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * Tox is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifndef _TEST__HELPER_ | ||
26 | #define _TEST__HELPER_ | ||
27 | |||
28 | #include "../toxrtp_helper.h" | ||
29 | |||
30 | #define RTP_PORT 31003 | ||
31 | #define RTP_PORT_LISTEN 31001 | ||
32 | |||
33 | #define _SLEEP_INTERVAL 1000 | ||
34 | |||
35 | typedef struct arg_s { | ||
36 | const char* value; | ||
37 | struct arg_s* next; | ||
38 | struct arg_s* prev; | ||
39 | |||
40 | } arg_t; | ||
41 | |||
42 | |||
43 | |||
44 | /* Parses arguments into d-list arg_t */ | ||
45 | arg_t* parse_args ( int argc, char* argv[] ); | ||
46 | |||
47 | /* Get a single argument ( i.e. ./test -s |find if has 's' >> | find_arg_simple(_t, "-s") ) | ||
48 | * A little error checking, of course, returns FAILURE if not found and if found returns position | ||
49 | * where it's found. | ||
50 | */ | ||
51 | int find_arg_simple ( arg_t* _head, const char* _id ); | ||
52 | |||
53 | /* Get a single argument ( i.e. ./test -d 127.0.0.1 |get 'd' value >> | find_arg_duble(_t, "-d") ) | ||
54 | * A little error checking, of course, returns NULL if not found and if found returns value | ||
55 | * of that argument ( i.e. '127.0.0.1'). | ||
56 | */ | ||
57 | const char* find_arg_duble ( arg_t* _head, const char* _id ); | ||
58 | |||
59 | #endif /* _TEST__HELPER_ */ | ||
60 | |||
61 | |||
diff --git a/toxrtp/toxrtp.c b/toxrtp/toxrtp.c deleted file mode 100644 index 6844b0b1..00000000 --- a/toxrtp/toxrtp.c +++ /dev/null | |||
@@ -1,693 +0,0 @@ | |||
1 | /* rtp_impl.c | ||
2 | * | ||
3 | * Rtp implementation includes rtp_session_s struct which is a session identifier. | ||
4 | * It contains session information and it's a must for every session. | ||
5 | * It's best if you don't touch any variable directly but use callbacks to do so. !Red! | ||
6 | * | ||
7 | * | ||
8 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
9 | * | ||
10 | * This file is part of Tox. | ||
11 | * | ||
12 | * Tox is free software: you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License as published by | ||
14 | * the Free Software Foundation, either version 3 of the License, or | ||
15 | * (at your option) any later version. | ||
16 | * | ||
17 | * Tox is distributed in the hope that it will be useful, | ||
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
20 | * GNU General Public License for more details. | ||
21 | * | ||
22 | * You should have received a copy of the GNU General Public License | ||
23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | #ifdef HAVE_CONFIG_H | ||
28 | #include "config.h" | ||
29 | #endif /* HAVE_CONFIG_H */ | ||
30 | |||
31 | #include "toxrtp.h" | ||
32 | #include "toxrtp_message.h" | ||
33 | #include "toxrtp_helper.h" | ||
34 | #include <assert.h> | ||
35 | #include <pthread.h> | ||
36 | #include "../toxcore/util.h" | ||
37 | #include "../toxcore/network.h" | ||
38 | |||
39 | /* Some defines */ | ||
40 | #define PAYLOAD_ID_VALUE_OPUS 1 | ||
41 | #define PAYLOAD_ID_VALUE_VP8 2 | ||
42 | |||
43 | #define size_32 4 | ||
44 | /* End of defines */ | ||
45 | |||
46 | #ifdef _USE_ERRORS | ||
47 | #include "toxrtp_error_id.h" | ||
48 | #endif /* _USE_ERRORS */ | ||
49 | |||
50 | static const uint32_t _payload_table[] = /* PAYLOAD TABLE */ | ||
51 | { | ||
52 | 8000, 8000, 8000, 8000, 8000, 8000, 16000, 8000, 8000, 8000, /* 0-9 */ | ||
53 | 44100, 44100, 0, 0, 90000, 8000, 11025, 22050, 0, 0, /* 10-19 */ | ||
54 | 0, 0, 0, 0, 0, 90000, 90000, 0, 90000, 0, /* 20-29 */ | ||
55 | 0, 90000, 90000, 90000, 90000, 0, 0, 0, 0, 0, /* 30-39 */ | ||
56 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40-49 */ | ||
57 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 50-59 */ | ||
58 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60-69 */ | ||
59 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 70-79 */ | ||
60 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80-89 */ | ||
61 | 0, 0, 0, 0, 0, 0, PAYLOAD_ID_VALUE_OPUS, 0, 0, 0, /* 90-99 */ | ||
62 | 0, 0, 0, 0, 0, 0, PAYLOAD_ID_VALUE_VP8, 0, 0, 0, /* 100-109 */ | ||
63 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 110-119 */ | ||
64 | 0, 0, 0, 0, 0, 0, 0, 0 /* 120-127 */ | ||
65 | }; | ||
66 | |||
67 | /* Current compatibility solution */ | ||
68 | int m_sendpacket(Networking_Core* _core_handler, void *ip_port, uint8_t *data, uint32_t length) | ||
69 | { | ||
70 | return sendpacket(_core_handler, *((IP_Port*) ip_port), data, length); | ||
71 | } | ||
72 | |||
73 | rtp_session_t* rtp_init_session ( int max_users, int _multi_session ) | ||
74 | { | ||
75 | #ifdef _USE_ERRORS | ||
76 | REGISTER_RTP_ERRORS | ||
77 | #endif /* _USE_ERRORS */ | ||
78 | |||
79 | rtp_session_t* _retu = calloc(sizeof(rtp_session_t), 1); | ||
80 | assert(_retu); | ||
81 | |||
82 | _retu->_dest_list = _retu->_last_user = NULL; | ||
83 | |||
84 | _retu->_max_users = max_users; | ||
85 | _retu->_packets_recv = 0; | ||
86 | _retu->_packets_sent = 0; | ||
87 | _retu->_bytes_sent = 0; | ||
88 | _retu->_bytes_recv = 0; | ||
89 | _retu->_last_error = NULL; | ||
90 | _retu->_packet_loss = 0; | ||
91 | |||
92 | /* | ||
93 | * SET HEADER FIELDS | ||
94 | */ | ||
95 | |||
96 | _retu->_version = RTP_VERSION; /* It's always 2 */ | ||
97 | _retu->_padding = 0; /* If some additional data is needed about | ||
98 | * the packet */ | ||
99 | _retu->_extension = 0; /* If extension to header is needed */ | ||
100 | _retu->_cc = 1; /* It basically represents amount of contributors */ | ||
101 | _retu->_csrc = NULL; /* Container */ | ||
102 | _retu->_ssrc = t_random ( -1 ); | ||
103 | _retu->_marker = 0; | ||
104 | _retu->_payload_type = 0; /* You should specify payload type */ | ||
105 | |||
106 | /* Sequence starts at random number and goes to _MAX_SEQU_NUM */ | ||
107 | _retu->_sequence_number = t_random ( _MAX_SEQU_NUM ); | ||
108 | _retu->_last_sequence_number = _retu->_sequence_number; /* Do not touch this variable */ | ||
109 | |||
110 | _retu->_initial_time = t_time(); /* In seconds */ | ||
111 | assert(_retu->_initial_time); | ||
112 | _retu->_time_elapsed = 0; /* In seconds */ | ||
113 | |||
114 | _retu->_ext_header = NULL; /* When needed allocate */ | ||
115 | _retu->_exthdr_framerate = -1; | ||
116 | _retu->_exthdr_resolution = -1; | ||
117 | |||
118 | _retu->_csrc = calloc(sizeof(uint32_t), 1); | ||
119 | assert(_retu->_csrc); | ||
120 | |||
121 | _retu->_csrc[0] = _retu->_ssrc; /* Set my ssrc to the list receive */ | ||
122 | |||
123 | _retu->_prefix_length = 0; | ||
124 | _retu->_prefix = NULL; | ||
125 | |||
126 | _retu->_multi_session = _multi_session; | ||
127 | |||
128 | /* Initial */ | ||
129 | _retu->_current_framerate = 0; | ||
130 | |||
131 | |||
132 | _retu->_oldest_msg = _retu->_last_msg = NULL; | ||
133 | |||
134 | pthread_mutex_init(&_retu->_mutex, NULL); | ||
135 | /* | ||
136 | * | ||
137 | */ | ||
138 | return _retu; | ||
139 | } | ||
140 | |||
141 | int rtp_terminate_session ( rtp_session_t* _session ) | ||
142 | { | ||
143 | if ( !_session ) | ||
144 | return FAILURE; | ||
145 | |||
146 | if ( _session->_dest_list ){ | ||
147 | rtp_dest_list_t* _fordel = NULL; | ||
148 | rtp_dest_list_t* _tmp = _session->_dest_list; | ||
149 | |||
150 | while( _tmp ){ | ||
151 | _fordel = _tmp; | ||
152 | _tmp = _tmp->next; | ||
153 | free(_fordel); | ||
154 | } | ||
155 | } | ||
156 | |||
157 | if ( _session->_ext_header ) | ||
158 | free ( _session->_ext_header ); | ||
159 | |||
160 | if ( _session->_csrc ) | ||
161 | free ( _session->_csrc ); | ||
162 | |||
163 | if ( _session->_prefix ) | ||
164 | free ( _session->_prefix ); | ||
165 | |||
166 | pthread_mutex_destroy(&_session->_mutex); | ||
167 | |||
168 | /* And finally free session */ | ||
169 | free ( _session ); | ||
170 | |||
171 | return SUCCESS; | ||
172 | } | ||
173 | |||
174 | uint16_t rtp_get_resolution_marking_height ( rtp_ext_header_t* _header, uint32_t _position ) | ||
175 | { | ||
176 | if ( _header->_ext_type & RTP_EXT_TYPE_RESOLUTION ) | ||
177 | return _header->_hd_ext[_position]; | ||
178 | else | ||
179 | return 0; | ||
180 | } | ||
181 | |||
182 | uint16_t rtp_get_resolution_marking_width ( rtp_ext_header_t* _header, uint32_t _position ) | ||
183 | { | ||
184 | if ( _header->_ext_type & RTP_EXT_TYPE_RESOLUTION ) | ||
185 | return ( _header->_hd_ext[_position] >> 16 ); | ||
186 | else | ||
187 | return 0; | ||
188 | } | ||
189 | |||
190 | void rtp_free_msg ( rtp_session_t* _session, rtp_msg_t* _message ) | ||
191 | { | ||
192 | free ( _message->_data ); | ||
193 | |||
194 | if ( !_session ){ | ||
195 | free ( _message->_header->_csrc ); | ||
196 | if ( _message->_ext_header ){ | ||
197 | free ( _message->_ext_header->_hd_ext ); | ||
198 | free ( _message->_ext_header ); | ||
199 | } | ||
200 | } else { | ||
201 | if ( _session->_csrc != _message->_header->_csrc ) | ||
202 | free ( _message->_header->_csrc ); | ||
203 | if ( _message->_ext_header && _session->_ext_header != _message->_ext_header ) { | ||
204 | free ( _message->_ext_header->_hd_ext ); | ||
205 | free ( _message->_ext_header ); | ||
206 | } | ||
207 | } | ||
208 | |||
209 | free ( _message->_header ); | ||
210 | free ( _message ); | ||
211 | } | ||
212 | |||
213 | rtp_header_t* rtp_build_header ( rtp_session_t* _session ) | ||
214 | { | ||
215 | rtp_header_t* _retu; | ||
216 | _retu = calloc ( sizeof * _retu, 1 ); | ||
217 | assert(_retu); | ||
218 | |||
219 | rtp_header_add_flag_version ( _retu, _session->_version ); | ||
220 | rtp_header_add_flag_padding ( _retu, _session->_padding ); | ||
221 | rtp_header_add_flag_extension ( _retu, _session->_extension ); | ||
222 | rtp_header_add_flag_CSRC_count ( _retu, _session->_cc ); | ||
223 | rtp_header_add_setting_marker ( _retu, _session->_marker ); | ||
224 | rtp_header_add_setting_payload ( _retu, _session->_payload_type ); | ||
225 | |||
226 | _retu->_sequence_number = _session->_sequence_number; | ||
227 | _session->_time_elapsed = t_time() - _session->_initial_time; | ||
228 | _retu->_timestamp = t_time(); | ||
229 | _retu->_ssrc = _session->_ssrc; | ||
230 | |||
231 | if ( _session->_cc > 0 ) { | ||
232 | _retu->_csrc = calloc(sizeof(uint32_t), _session->_cc); | ||
233 | assert(_retu->_csrc); | ||
234 | |||
235 | int i; | ||
236 | |||
237 | for ( i = 0; i < _session->_cc; i++ ) { | ||
238 | _retu->_csrc[i] = _session->_csrc[i]; | ||
239 | } | ||
240 | } else { | ||
241 | _retu->_csrc = NULL; | ||
242 | } | ||
243 | |||
244 | _retu->_length = _MIN_HEADER_LENGTH + ( _session->_cc * size_32 ); | ||
245 | |||
246 | return _retu; | ||
247 | } | ||
248 | |||
249 | void rtp_set_payload_type ( rtp_session_t* _session, uint8_t _payload_value ) | ||
250 | { | ||
251 | _session->_payload_type = _payload_value; | ||
252 | } | ||
253 | uint32_t rtp_get_payload_type ( rtp_session_t* _session ) | ||
254 | { | ||
255 | return _payload_table[_session->_payload_type]; | ||
256 | } | ||
257 | |||
258 | int rtp_add_receiver ( rtp_session_t* _session, tox_IP_Port* _dest ) | ||
259 | { | ||
260 | if ( !_session ) | ||
261 | return FAILURE; | ||
262 | |||
263 | rtp_dest_list_t* _new_user = calloc(sizeof(rtp_dest_list_t), 1); | ||
264 | assert(_new_user); | ||
265 | |||
266 | _new_user->next = NULL; | ||
267 | _new_user->_dest = *_dest; | ||
268 | |||
269 | if ( _session->_last_user == NULL ) { /* New member */ | ||
270 | _session->_dest_list = _session->_last_user = _new_user; | ||
271 | |||
272 | } else { /* Append */ | ||
273 | _session->_last_user->next = _new_user; | ||
274 | _session->_last_user = _new_user; | ||
275 | } | ||
276 | |||
277 | return SUCCESS; | ||
278 | } | ||
279 | |||
280 | int rtp_send_msg ( rtp_session_t* _session, rtp_msg_t* _msg, void* _core_handler ) | ||
281 | { | ||
282 | if ( !_msg || _msg->_data == NULL || _msg->_length <= 0 ) { | ||
283 | t_perror ( RTP_ERROR_EMPTY_MESSAGE ); | ||
284 | return FAILURE; | ||
285 | } | ||
286 | |||
287 | int _last; | ||
288 | unsigned long long _total = 0; | ||
289 | |||
290 | size_t _length = _msg->_length; | ||
291 | uint8_t _send_data [ MAX_UDP_PACKET_SIZE ]; | ||
292 | |||
293 | uint16_t _prefix_length = _session->_prefix_length; | ||
294 | |||
295 | _send_data[0] = 70; | ||
296 | |||
297 | if ( _session->_prefix && _length + _prefix_length < MAX_UDP_PACKET_SIZE ) { | ||
298 | /*t_memcpy(_send_data, _session->_prefix, _prefix_length);*/ | ||
299 | t_memcpy ( _send_data + 1, _msg->_data, _length ); | ||
300 | } else { | ||
301 | t_memcpy ( _send_data + 1, _msg->_data, _length ); | ||
302 | } | ||
303 | |||
304 | /* Set sequ number */ | ||
305 | if ( _session->_sequence_number >= _MAX_SEQU_NUM ) { | ||
306 | _session->_sequence_number = 0; | ||
307 | } else { | ||
308 | _session->_sequence_number++; | ||
309 | } | ||
310 | |||
311 | /* Start sending loop */ | ||
312 | rtp_dest_list_t* _it; | ||
313 | for ( _it = _session->_dest_list; _it != NULL; _it = _it->next ) { | ||
314 | |||
315 | _last = m_sendpacket ( _core_handler, &_it->_dest, _send_data, _length + 1); | ||
316 | |||
317 | if ( _last < 0 ) { | ||
318 | t_perror ( RTP_ERROR_STD_SEND_FAILURE ); | ||
319 | printf("Stderror: %s", strerror(errno)); | ||
320 | } else { | ||
321 | _session->_packets_sent ++; | ||
322 | _total += _last; | ||
323 | } | ||
324 | |||
325 | } | ||
326 | |||
327 | rtp_free_msg ( _session, _msg ); | ||
328 | _session->_bytes_sent += _total; | ||
329 | return SUCCESS; | ||
330 | } | ||
331 | |||
332 | rtp_msg_t* rtp_recv_msg ( rtp_session_t* _session ) | ||
333 | { | ||
334 | if ( !_session ) | ||
335 | return NULL; | ||
336 | |||
337 | rtp_msg_t* _retu = _session->_oldest_msg; | ||
338 | |||
339 | pthread_mutex_lock(&_session->_mutex); | ||
340 | |||
341 | if ( _retu ) | ||
342 | _session->_oldest_msg = _retu->_next; | ||
343 | |||
344 | if ( !_session->_oldest_msg ) | ||
345 | _session->_last_msg = NULL; | ||
346 | |||
347 | pthread_mutex_unlock(&_session->_mutex); | ||
348 | |||
349 | return _retu; | ||
350 | } | ||
351 | |||
352 | void rtp_store_msg ( rtp_session_t* _session, rtp_msg_t* _msg ) | ||
353 | { | ||
354 | if ( rtp_check_late_message(_session, _msg) < 0 ) { | ||
355 | rtp_register_msg(_session, _msg); | ||
356 | } | ||
357 | |||
358 | pthread_mutex_lock(&_session->_mutex); | ||
359 | |||
360 | if ( _session->_last_msg ) { | ||
361 | _session->_last_msg->_next = _msg; | ||
362 | _session->_last_msg = _msg; | ||
363 | } else { | ||
364 | _session->_last_msg = _session->_oldest_msg = _msg; | ||
365 | } | ||
366 | |||
367 | pthread_mutex_unlock(&_session->_mutex); | ||
368 | return; | ||
369 | } | ||
370 | |||
371 | int rtp_release_session_recv ( rtp_session_t* _session ) | ||
372 | { | ||
373 | if ( !_session ){ | ||
374 | return FAILURE; | ||
375 | } | ||
376 | |||
377 | rtp_msg_t* _tmp,* _it; | ||
378 | |||
379 | pthread_mutex_lock(&_session->_mutex); | ||
380 | |||
381 | for ( _it = _session->_oldest_msg; _it; _it = _tmp ){ | ||
382 | _tmp = _it->_next; | ||
383 | rtp_free_msg(_session, _it); | ||
384 | } | ||
385 | |||
386 | _session->_last_msg = _session->_oldest_msg = NULL; | ||
387 | |||
388 | pthread_mutex_unlock(&_session->_mutex); | ||
389 | |||
390 | return SUCCESS; | ||
391 | } | ||
392 | |||
393 | rtp_msg_t* rtp_msg_new ( rtp_session_t* _session, const uint8_t* _data, uint32_t _length ) | ||
394 | { | ||
395 | if ( !_session ) | ||
396 | return NULL; | ||
397 | |||
398 | uint8_t* _from_pos; | ||
399 | rtp_msg_t* _retu = calloc(sizeof(rtp_msg_t), 1); | ||
400 | assert(_retu); | ||
401 | |||
402 | /* Sets header values and copies the extension header in _retu */ | ||
403 | _retu->_header = rtp_build_header ( _session ); /* It allocates memory and all */ | ||
404 | _retu->_ext_header = _session->_ext_header; | ||
405 | |||
406 | uint32_t _total_lenght = _length + _retu->_header->_length; | ||
407 | |||
408 | if ( _retu->_ext_header ) { | ||
409 | |||
410 | _total_lenght += ( _MIN_EXT_HEADER_LENGTH + _retu->_ext_header->_ext_len * size_32 ); | ||
411 | /* Allocate Memory for _retu->_data */ | ||
412 | _retu->_data = calloc ( sizeof _retu->_data, _total_lenght ); | ||
413 | assert(_retu->_data); | ||
414 | |||
415 | _from_pos = rtp_add_header ( _retu->_header, _retu->_data ); | ||
416 | _from_pos = rtp_add_extention_header ( _retu->_ext_header, _from_pos + 1 ); | ||
417 | } else { | ||
418 | /* Allocate Memory for _retu->_data */ | ||
419 | _retu->_data = calloc ( sizeof _retu->_data, _total_lenght ); | ||
420 | assert(_retu->_data); | ||
421 | |||
422 | _from_pos = rtp_add_header ( _retu->_header, _retu->_data ); | ||
423 | } | ||
424 | |||
425 | /* | ||
426 | * Parses the extension header into the message | ||
427 | * Of course if any | ||
428 | */ | ||
429 | |||
430 | /* Appends _data on to _retu->_data */ | ||
431 | t_memcpy ( _from_pos + 1, _data, _length ); | ||
432 | |||
433 | _retu->_length = _total_lenght; | ||
434 | |||
435 | _retu->_next = NULL; | ||
436 | |||
437 | return _retu; | ||
438 | } | ||
439 | |||
440 | rtp_msg_t* rtp_msg_parse ( rtp_session_t* _session, const uint8_t* _data, uint32_t _length ) | ||
441 | { | ||
442 | rtp_msg_t* _retu = calloc(sizeof(rtp_msg_t), 1); | ||
443 | assert(_retu); | ||
444 | |||
445 | _retu->_header = rtp_extract_header ( _data, _length ); /* It allocates memory and all */ | ||
446 | if ( !_retu->_header ){ | ||
447 | free(_retu); | ||
448 | return NULL; | ||
449 | } | ||
450 | |||
451 | _retu->_length = _length - _retu->_header->_length; | ||
452 | |||
453 | uint16_t _from_pos = _retu->_header->_length; | ||
454 | |||
455 | |||
456 | if ( rtp_header_get_flag_extension ( _retu->_header ) ) { | ||
457 | _retu->_ext_header = rtp_extract_ext_header ( _data + _from_pos, _length ); | ||
458 | if ( _retu->_ext_header ){ | ||
459 | _retu->_length -= ( _MIN_EXT_HEADER_LENGTH + _retu->_ext_header->_ext_len * size_32 ); | ||
460 | _from_pos += ( _MIN_EXT_HEADER_LENGTH + _retu->_ext_header->_ext_len * size_32 ); | ||
461 | } else { | ||
462 | free (_retu->_ext_header); | ||
463 | free (_retu->_header); | ||
464 | free (_retu); | ||
465 | return NULL; | ||
466 | } | ||
467 | } else { | ||
468 | _retu->_ext_header = NULL; | ||
469 | } | ||
470 | |||
471 | /* Get the payload */ | ||
472 | _retu->_data = calloc ( sizeof ( uint8_t ), _retu->_length ); | ||
473 | assert(_retu->_data); | ||
474 | |||
475 | t_memcpy ( _retu->_data, _data + _from_pos, _length - _from_pos ); | ||
476 | |||
477 | _retu->_next = NULL; | ||
478 | |||
479 | |||
480 | if ( _session && !_session->_multi_session && rtp_check_late_message(_session, _retu) < 0 ){ | ||
481 | rtp_register_msg(_session, _retu); | ||
482 | } | ||
483 | |||
484 | return _retu; | ||
485 | } | ||
486 | |||
487 | int rtp_check_late_message (rtp_session_t* _session, rtp_msg_t* _msg) | ||
488 | { | ||
489 | /* | ||
490 | * Check Sequence number. If this new msg has lesser number then the _session->_last_sequence_number | ||
491 | * it shows that the message came in late | ||
492 | */ | ||
493 | if ( _msg->_header->_sequence_number < _session->_last_sequence_number && | ||
494 | _msg->_header->_timestamp < _session->_current_timestamp | ||
495 | ) { | ||
496 | return SUCCESS; /* Drop the packet. You can check if the packet dropped by checking _packet_loss increment. */ | ||
497 | } | ||
498 | return FAILURE; | ||
499 | } | ||
500 | |||
501 | void rtp_register_msg ( rtp_session_t* _session, rtp_msg_t* _msg ) | ||
502 | { | ||
503 | _session->_last_sequence_number = _msg->_header->_sequence_number; | ||
504 | _session->_current_timestamp = _msg->_header->_timestamp; | ||
505 | } | ||
506 | |||
507 | |||
508 | int rtp_add_resolution_marking ( rtp_session_t* _session, uint16_t _width, uint16_t _height ) | ||
509 | { | ||
510 | if ( !_session ) | ||
511 | return FAILURE; | ||
512 | |||
513 | rtp_ext_header_t* _ext_header = _session->_ext_header; | ||
514 | _session->_exthdr_resolution = 0; | ||
515 | |||
516 | if ( ! ( _ext_header ) ) { | ||
517 | _session->_ext_header = calloc (sizeof(rtp_ext_header_t), 1); | ||
518 | assert(_session->_ext_header); | ||
519 | |||
520 | _session->_extension = 1; | ||
521 | _session->_ext_header->_ext_len = 1; | ||
522 | _ext_header = _session->_ext_header; | ||
523 | _session->_ext_header->_hd_ext = calloc(sizeof(uint32_t), 1); | ||
524 | assert(_session->_ext_header->_hd_ext); | ||
525 | |||
526 | } else { /* If there is need for more headers this will be needed to change */ | ||
527 | if ( !(_ext_header->_ext_type & RTP_EXT_TYPE_RESOLUTION) ){ | ||
528 | uint32_t _exthdr_framerate = _ext_header->_hd_ext[_session->_exthdr_framerate]; | ||
529 | /* it's position is at 2nd place by default */ | ||
530 | _session->_exthdr_framerate ++; | ||
531 | |||
532 | /* Update length */ | ||
533 | _ext_header->_ext_len++; | ||
534 | |||
535 | /* Allocate the value */ | ||
536 | _ext_header->_hd_ext = realloc(_ext_header->_hd_ext, sizeof(rtp_ext_header_t) * _ext_header->_ext_len); | ||
537 | assert(_ext_header->_hd_ext); | ||
538 | |||
539 | /* Reset other values */ | ||
540 | _ext_header->_hd_ext[_session->_exthdr_framerate] = _exthdr_framerate; | ||
541 | } | ||
542 | } | ||
543 | |||
544 | /* Add flag */ | ||
545 | _ext_header->_ext_type |= RTP_EXT_TYPE_RESOLUTION; | ||
546 | |||
547 | _ext_header->_hd_ext[_session->_exthdr_resolution] = _width << 16 | ( uint32_t ) _height; | ||
548 | |||
549 | return SUCCESS; | ||
550 | } | ||
551 | |||
552 | int rtp_remove_resolution_marking ( rtp_session_t* _session ) | ||
553 | { | ||
554 | if ( _session->_extension == 0 || ! ( _session->_ext_header ) ) { | ||
555 | t_perror ( RTP_ERROR_INVALID_EXTERNAL_HEADER ); | ||
556 | return FAILURE; | ||
557 | } | ||
558 | |||
559 | if ( !( _session->_ext_header->_ext_type & RTP_EXT_TYPE_RESOLUTION ) ) { | ||
560 | t_perror ( RTP_ERROR_INVALID_EXTERNAL_HEADER ); | ||
561 | return FAILURE; | ||
562 | } | ||
563 | |||
564 | _session->_ext_header->_ext_type &= ~RTP_EXT_TYPE_RESOLUTION; /* Remove the flag */ | ||
565 | _session->_exthdr_resolution = -1; /* Remove identifier */ | ||
566 | |||
567 | /* Check if extension is empty */ | ||
568 | if ( _session->_ext_header->_ext_type == 0 ){ | ||
569 | |||
570 | free ( _session->_ext_header->_hd_ext ); | ||
571 | free ( _session->_ext_header ); | ||
572 | |||
573 | _session->_ext_header = NULL; /* It's very important */ | ||
574 | _session->_extension = 0; | ||
575 | |||
576 | } else { | ||
577 | _session->_ext_header->_ext_len --; | ||
578 | |||
579 | /* this will also be needed to change if there are more than 2 headers */ | ||
580 | if ( _session->_ext_header->_ext_type & RTP_EXT_TYPE_FRAMERATE ){ | ||
581 | memcpy(_session->_ext_header->_hd_ext + 1, _session->_ext_header->_hd_ext, _session->_ext_header->_ext_len); | ||
582 | _session->_exthdr_framerate = 0; | ||
583 | _session->_ext_header->_hd_ext = realloc( _session->_ext_header->_hd_ext, sizeof( rtp_ext_header_t ) * _session->_ext_header->_ext_len ); | ||
584 | assert(_session->_ext_header->_hd_ext); | ||
585 | } | ||
586 | } | ||
587 | |||
588 | return SUCCESS; | ||
589 | } | ||
590 | |||
591 | int rtp_add_framerate_marking ( rtp_session_t* _session, uint32_t _value ) | ||
592 | { | ||
593 | if ( !_session ) | ||
594 | return FAILURE; | ||
595 | |||
596 | rtp_ext_header_t* _ext_header = _session->_ext_header; | ||
597 | _session->_exthdr_framerate = 0; | ||
598 | |||
599 | if ( ! ( _ext_header ) ) { | ||
600 | _session->_ext_header = calloc (sizeof(rtp_ext_header_t), 1); | ||
601 | assert(_session->_ext_header); | ||
602 | |||
603 | _session->_extension = 1; | ||
604 | _session->_ext_header->_ext_len = 1; | ||
605 | _ext_header = _session->_ext_header; | ||
606 | _session->_ext_header->_hd_ext = calloc(sizeof(uint32_t), 1); | ||
607 | assert(_session->_ext_header->_hd_ext); | ||
608 | } else { /* If there is need for more headers this will be needed to change */ | ||
609 | if ( !(_ext_header->_ext_type & RTP_EXT_TYPE_FRAMERATE) ){ | ||
610 | /* it's position is at 2nd place by default */ | ||
611 | _session->_exthdr_framerate ++; | ||
612 | |||
613 | /* Update length */ | ||
614 | _ext_header->_ext_len++; | ||
615 | |||
616 | /* Allocate the value */ | ||
617 | _ext_header->_hd_ext = realloc(_ext_header->_hd_ext, sizeof(rtp_ext_header_t) * _ext_header->_ext_len); | ||
618 | assert(_ext_header->_hd_ext); | ||
619 | |||
620 | } | ||
621 | } | ||
622 | |||
623 | /* Add flag */ | ||
624 | _ext_header->_ext_type |= RTP_EXT_TYPE_FRAMERATE; | ||
625 | |||
626 | _ext_header->_hd_ext[_session->_exthdr_framerate] = _value; | ||
627 | |||
628 | return SUCCESS; | ||
629 | } | ||
630 | |||
631 | |||
632 | int rtp_remove_framerate_marking ( rtp_session_t* _session ) | ||
633 | { | ||
634 | if ( _session->_extension == 0 || ! ( _session->_ext_header ) ) { | ||
635 | t_perror ( RTP_ERROR_INVALID_EXTERNAL_HEADER ); | ||
636 | return FAILURE; | ||
637 | } | ||
638 | |||
639 | if ( !( _session->_ext_header->_ext_type & RTP_EXT_TYPE_FRAMERATE ) ) { | ||
640 | t_perror ( RTP_ERROR_INVALID_EXTERNAL_HEADER ); | ||
641 | return FAILURE; | ||
642 | } | ||
643 | |||
644 | _session->_ext_header->_ext_type &= ~RTP_EXT_TYPE_FRAMERATE; /* Remove the flag */ | ||
645 | _session->_exthdr_framerate = -1; /* Remove identifier */ | ||
646 | _session->_ext_header->_ext_len --; | ||
647 | |||
648 | /* Check if extension is empty */ | ||
649 | if ( _session->_ext_header->_ext_type == 0 ){ | ||
650 | |||
651 | free ( _session->_ext_header->_hd_ext ); | ||
652 | free ( _session->_ext_header ); | ||
653 | |||
654 | _session->_ext_header = NULL; /* It's very important */ | ||
655 | _session->_extension = 0; | ||
656 | |||
657 | } else if ( !_session->_ext_header->_ext_len ) { | ||
658 | |||
659 | /* this will also be needed to change if there are more than 2 headers */ | ||
660 | _session->_ext_header->_hd_ext = realloc( _session->_ext_header->_hd_ext, sizeof( rtp_ext_header_t ) * _session->_ext_header->_ext_len ); | ||
661 | assert(_session->_ext_header->_hd_ext); | ||
662 | |||
663 | } | ||
664 | |||
665 | return SUCCESS; | ||
666 | } | ||
667 | |||
668 | uint32_t rtp_get_framerate_marking ( rtp_ext_header_t* _header ) | ||
669 | { | ||
670 | if ( _header->_ext_len == 1 ){ | ||
671 | return _header->_hd_ext[0]; | ||
672 | } else { | ||
673 | return _header->_hd_ext[1]; | ||
674 | } | ||
675 | } | ||
676 | |||
677 | int rtp_set_prefix ( rtp_session_t* _session, uint8_t* _prefix, uint16_t _prefix_length ) | ||
678 | { | ||
679 | if ( !_session ) | ||
680 | return FAILURE; | ||
681 | |||
682 | if ( _session->_prefix ) { | ||
683 | free ( _session->_prefix ); | ||
684 | } | ||
685 | |||
686 | _session->_prefix = calloc ( ( sizeof * _session->_prefix ), _prefix_length ); | ||
687 | assert(_session->_prefix); | ||
688 | |||
689 | t_memcpy ( _session->_prefix, _prefix, _prefix_length ); | ||
690 | _session->_prefix_length = _prefix_length; | ||
691 | |||
692 | return SUCCESS; | ||
693 | } | ||
diff --git a/toxrtp/toxrtp.h b/toxrtp/toxrtp.h deleted file mode 100644 index 0aa89993..00000000 --- a/toxrtp/toxrtp.h +++ /dev/null | |||
@@ -1,188 +0,0 @@ | |||
1 | /* rtp_impl.h | ||
2 | * | ||
3 | * Rtp implementation includes rtp_session_s struct which is a session identifier. | ||
4 | * It contains session information and it's a must for every session. | ||
5 | * It's best if you don't touch any variable directly but use callbacks to do so. !Red! | ||
6 | * | ||
7 | * | ||
8 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
9 | * | ||
10 | * This file is part of Tox. | ||
11 | * | ||
12 | * Tox is free software: you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License as published by | ||
14 | * the Free Software Foundation, either version 3 of the License, or | ||
15 | * (at your option) any later version. | ||
16 | * | ||
17 | * Tox is distributed in the hope that it will be useful, | ||
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
20 | * GNU General Public License for more details. | ||
21 | * | ||
22 | * You should have received a copy of the GNU General Public License | ||
23 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | |||
28 | #ifndef _RTP__IMPL_H_ | ||
29 | #define _RTP__IMPL_H_ | ||
30 | |||
31 | #define RTP_VERSION 2 | ||
32 | #include <inttypes.h> | ||
33 | #include "tox.h" | ||
34 | #include <pthread.h> | ||
35 | /* Extension header flags */ | ||
36 | #define RTP_EXT_TYPE_RESOLUTION 0x01 | ||
37 | #define RTP_EXT_TYPE_FRAMERATE 0x02 | ||
38 | |||
39 | /* Some defines */ | ||
40 | |||
41 | #define RTP_PACKET 70 | ||
42 | |||
43 | /* Payload identifiers */ | ||
44 | |||
45 | /* Audio */ | ||
46 | #define _PAYLOAD_OPUS 96 | ||
47 | |||
48 | /* Video */ | ||
49 | #define _PAYLOAD_VP8 106 | ||
50 | |||
51 | /* End of Payload identifiers */ | ||
52 | |||
53 | /* End of defines */ | ||
54 | |||
55 | |||
56 | /* Our main session descriptor. | ||
57 | * It measures the session variables and controls | ||
58 | * the entire session. There are functions for manipulating | ||
59 | * the session so tend to use those instead of directly accessing | ||
60 | * session parameters. | ||
61 | */ | ||
62 | typedef struct rtp_session_s { | ||
63 | uint8_t _version; | ||
64 | uint8_t _padding; | ||
65 | uint8_t _extension; | ||
66 | uint8_t _cc; | ||
67 | uint8_t _marker; | ||
68 | uint8_t _payload_type; | ||
69 | uint16_t _sequence_number; /* Set when sending */ | ||
70 | uint16_t _last_sequence_number; /* Check when recving msg */ | ||
71 | uint32_t _initial_time; | ||
72 | uint32_t _time_elapsed; | ||
73 | uint32_t _current_timestamp; | ||
74 | uint32_t _ssrc; | ||
75 | uint32_t *_csrc; | ||
76 | |||
77 | |||
78 | /* If some additional data must be sent via message | ||
79 | * apply it here. Only by allocating this member you will be | ||
80 | * automatically placing it within a message. | ||
81 | */ | ||
82 | |||
83 | struct rtp_ext_header_s *_ext_header; | ||
84 | /* External header identifiers */ | ||
85 | int _exthdr_resolution; | ||
86 | int _exthdr_framerate; | ||
87 | |||
88 | int _max_users; /* -1 undefined */ | ||
89 | |||
90 | uint64_t _packets_sent; /* measure packets */ | ||
91 | uint64_t _packets_recv; | ||
92 | |||
93 | uint64_t _bytes_sent; | ||
94 | uint64_t _bytes_recv; | ||
95 | |||
96 | uint64_t _packet_loss; | ||
97 | |||
98 | const char *_last_error; | ||
99 | |||
100 | struct rtp_dest_list_s *_dest_list; | ||
101 | struct rtp_dest_list_s *_last_user; /* a tail for faster appending */ | ||
102 | |||
103 | struct rtp_msg_s *_oldest_msg; | ||
104 | struct rtp_msg_s *_last_msg; /* tail */ | ||
105 | |||
106 | uint16_t _prefix_length; | ||
107 | uint8_t *_prefix; | ||
108 | |||
109 | /* Specifies multiple session use. | ||
110 | * When using one session it uses default value ( -1 ) | ||
111 | * Otherwise it's set to 1 and rtp_register_msg () is required | ||
112 | */ | ||
113 | int _multi_session; | ||
114 | |||
115 | uint32_t _current_framerate; | ||
116 | |||
117 | pthread_mutex_t _mutex; | ||
118 | |||
119 | } rtp_session_t; | ||
120 | |||
121 | |||
122 | /* | ||
123 | * Now i don't believe we need to store this _from thing every time | ||
124 | * since we have csrc table but will leave it like this for a while | ||
125 | */ | ||
126 | |||
127 | |||
128 | void rtp_free_msg ( rtp_session_t *_session, struct rtp_msg_s *_msg ); | ||
129 | int rtp_release_session_recv ( rtp_session_t *_session ); | ||
130 | |||
131 | /* Functions handling receiving */ | ||
132 | struct rtp_msg_s *rtp_recv_msg ( rtp_session_t *_session ); | ||
133 | void rtp_store_msg ( rtp_session_t *_session, struct rtp_msg_s *_msg ); | ||
134 | |||
135 | /* | ||
136 | * rtp_msg_parse() stores headers separately from the payload data | ||
137 | * and so the _length variable is set accordingly | ||
138 | */ | ||
139 | struct rtp_msg_s *rtp_msg_parse ( rtp_session_t *_session, const uint8_t *_data, uint32_t _length ); | ||
140 | |||
141 | int rtp_check_late_message (rtp_session_t *_session, struct rtp_msg_s *_msg); | ||
142 | void rtp_register_msg ( rtp_session_t *_session, struct rtp_msg_s * ); | ||
143 | |||
144 | /* Functions handling sending */ | ||
145 | int rtp_send_msg ( rtp_session_t *_session, struct rtp_msg_s *_msg, void *_core_handler ); | ||
146 | |||
147 | /* | ||
148 | * rtp_msg_new() stores headers and payload data in one container ( _data ) | ||
149 | * and the _length is set accordingly. Returned message is used for sending only | ||
150 | * so there is not much use of the headers there | ||
151 | */ | ||
152 | struct rtp_msg_s *rtp_msg_new ( rtp_session_t *_session, const uint8_t *_data, uint32_t _length ); | ||
153 | |||
154 | |||
155 | /* Convenient functions for creating a header */ | ||
156 | struct rtp_header_s *rtp_build_header ( rtp_session_t *_session ); | ||
157 | |||
158 | /* Functions handling session control */ | ||
159 | |||
160 | /* Handling an rtp packet */ | ||
161 | /* int rtp_handlepacket(uint8_t * packet, uint32_t length, IP_Port source); */ | ||
162 | |||
163 | /* Session initiation and termination. | ||
164 | * Set _multi_session to -1 if not using multiple sessions | ||
165 | */ | ||
166 | rtp_session_t *rtp_init_session ( int _max_users, int _multi_session ); | ||
167 | int rtp_terminate_session ( rtp_session_t *_session ); | ||
168 | |||
169 | /* Adding receiver */ | ||
170 | int rtp_add_receiver ( rtp_session_t *_session, tox_IP_Port *_dest ); | ||
171 | |||
172 | /* Convenient functions for marking the resolution */ | ||
173 | int rtp_add_resolution_marking ( rtp_session_t *_session, uint16_t _width, uint16_t _height ); | ||
174 | int rtp_remove_resolution_marking ( rtp_session_t *_session ); | ||
175 | uint16_t rtp_get_resolution_marking_height ( struct rtp_ext_header_s *_header, uint32_t _position ); | ||
176 | uint16_t rtp_get_resolution_marking_width ( struct rtp_ext_header_s *_header, uint32_t _position ); | ||
177 | |||
178 | int rtp_add_framerate_marking ( rtp_session_t *_session, uint32_t _value ); | ||
179 | int rtp_remove_framerate_marking ( rtp_session_t *_session ); | ||
180 | uint32_t rtp_get_framerate_marking ( struct rtp_ext_header_s *_header ); | ||
181 | /* Convenient functions for marking the payload */ | ||
182 | void rtp_set_payload_type ( rtp_session_t *_session, uint8_t _payload_value ); | ||
183 | uint32_t rtp_get_payload_type ( rtp_session_t *_session ); | ||
184 | |||
185 | /* When using RTP in core be sure to set prefix when sending via rtp_send_msg */ | ||
186 | int rtp_set_prefix ( rtp_session_t *_session, uint8_t *_prefix, uint16_t _prefix_length ); | ||
187 | |||
188 | #endif /* _RTP__IMPL_H_ */ | ||
diff --git a/toxrtp/toxrtp_error.c b/toxrtp/toxrtp_error.c deleted file mode 100644 index 3a7ff9a5..00000000 --- a/toxrtp/toxrtp_error.c +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | |||
2 | #ifdef HAVE_CONFIG_H | ||
3 | #include "config.h" | ||
4 | #endif /* HAVE_CONFIG_H */ | ||
5 | |||
6 | #include "toxrtp_error.h" | ||
7 | #include "toxrtp_helper.h" | ||
8 | |||
9 | #include <stdio.h> | ||
10 | #include <stdarg.h> | ||
11 | #include <string.h> | ||
12 | #include <stdlib.h> | ||
13 | #include <assert.h> | ||
14 | |||
15 | typedef struct rtp_error_s { | ||
16 | char* _message; | ||
17 | int _id; | ||
18 | |||
19 | } rtp_error_t; | ||
20 | |||
21 | static rtp_error_t* _register = NULL; | ||
22 | static size_t _it = 0; | ||
23 | |||
24 | void t_rtperr_register ( int _id, const char* _info ) | ||
25 | { | ||
26 | size_t _info_size = strlen ( _info ); | ||
27 | |||
28 | if ( !_register ) { | ||
29 | _register = calloc ( sizeof ( rtp_error_t ), 1 ); | ||
30 | } else { | ||
31 | _register = realloc ( _register, sizeof ( rtp_error_t ) * ( _it + 1 ) ); | ||
32 | } | ||
33 | assert(_register); | ||
34 | |||
35 | |||
36 | rtp_error_t* _current = & _register[_it]; | ||
37 | |||
38 | _current->_id = _id; | ||
39 | _current->_message = calloc ( sizeof(char), _info_size ); | ||
40 | assert(_current->_message); | ||
41 | |||
42 | t_memcpy ( (uint8_t*)_current->_message, (const uint8_t*)_info, _info_size ); | ||
43 | _it ++; | ||
44 | } | ||
45 | |||
46 | const char* t_rtperr ( int _errno ) | ||
47 | { | ||
48 | if ( !_register ) | ||
49 | return "Unregistered"; | ||
50 | |||
51 | uint32_t _i; | ||
52 | |||
53 | for ( _i = _it; _i--; ) { | ||
54 | if ( _register[_i]._id == _errno ) { | ||
55 | return _register[_i]._message; | ||
56 | } | ||
57 | } | ||
58 | |||
59 | return "Invalid error id!"; | ||
60 | } | ||
61 | |||
62 | void t_rtperr_print ( const char* _val, ... ) | ||
63 | { | ||
64 | va_list _args; | ||
65 | va_start ( _args, _val ); | ||
66 | vfprintf ( stderr, _val, _args ); | ||
67 | va_end ( _args ); | ||
68 | } | ||
diff --git a/toxrtp/toxrtp_error.h b/toxrtp/toxrtp_error.h deleted file mode 100644 index 0e017246..00000000 --- a/toxrtp/toxrtp_error.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifndef _RTP_ERROR_ | ||
2 | #define _RTP_ERROR_ | ||
3 | |||
4 | #define PRINT_FORMAT "Error %d: %s at %s:%d\n" | ||
5 | #define PRINT_ARGS( _errno ) _errno, t_rtperr(_errno), __FILE__, __LINE__ | ||
6 | |||
7 | |||
8 | const char* t_rtperr ( int _errno ); | ||
9 | void t_rtperr_register ( int _id, const char* _info ); | ||
10 | |||
11 | void t_invoke_error ( int _id ); | ||
12 | void t_rtperr_print ( const char* _val, ... ); | ||
13 | |||
14 | |||
15 | #ifdef _USE_ERRORS | ||
16 | #define t_perror( _errno ) t_rtperr_print ( PRINT_FORMAT, PRINT_ARGS ( _errno ) ) | ||
17 | #else | ||
18 | #define t_perror( _errno )do { } while(0) | ||
19 | #endif /* _USE_ERRORS */ | ||
20 | |||
21 | #ifdef _STDIO_H | ||
22 | #define t_errexit( _errno ) exit(-_errno) | ||
23 | #endif /* _STDIO_H */ | ||
24 | |||
25 | #endif /* _RTP_ERROR_ */ | ||
diff --git a/toxrtp/toxrtp_error_id.h b/toxrtp/toxrtp_error_id.h deleted file mode 100644 index 201aa936..00000000 --- a/toxrtp/toxrtp_error_id.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | #ifndef _RTP_ERROR_ID_ | ||
2 | #define _RTP_ERROR_ID_ | ||
3 | |||
4 | #include "toxrtp_error.h" | ||
5 | |||
6 | typedef enum error_s { | ||
7 | RTP_ERROR_PACKET_DROPED = 1, | ||
8 | RTP_ERROR_EMPTY_MESSAGE, | ||
9 | RTP_ERROR_STD_SEND_FAILURE, | ||
10 | RTP_ERROR_NO_EXTERNAL_HEADER, | ||
11 | RTP_ERROR_INVALID_EXTERNAL_HEADER, | ||
12 | RTP_ERROR_HEADER_PARSING, | ||
13 | RTP_ERROR_PAYLOAD_NULL, | ||
14 | RTP_ERROR_PAYLOAD_INVALID, | ||
15 | |||
16 | } error_t; | ||
17 | |||
18 | |||
19 | /* Only needed to be called once */ | ||
20 | #ifndef REGISTER_RTP_ERRORS | ||
21 | #define REGISTER_RTP_ERRORS \ | ||
22 | t_rtperr_register( RTP_ERROR_PACKET_DROPED, "Ivalid sequence number, packet is late" ); \ | ||
23 | t_rtperr_register( RTP_ERROR_EMPTY_MESSAGE, "Tried to send an empty message" ); \ | ||
24 | t_rtperr_register( RTP_ERROR_STD_SEND_FAILURE, "Failed call function: sendto" ); \ | ||
25 | t_rtperr_register( RTP_ERROR_NO_EXTERNAL_HEADER, "While parsing external header" ); \ | ||
26 | t_rtperr_register( RTP_ERROR_INVALID_EXTERNAL_HEADER, "While parsing external header" ); \ | ||
27 | t_rtperr_register( RTP_ERROR_HEADER_PARSING, "While parsing header" ); \ | ||
28 | t_rtperr_register( RTP_ERROR_PAYLOAD_NULL, "Payload is NULL" ); \ | ||
29 | t_rtperr_register( RTP_ERROR_PAYLOAD_INVALID, "Invalid payload size" ); | ||
30 | #endif /* REGISTER_RTP_ERRORS */ | ||
31 | |||
32 | #endif /* _RTP_ERROR_ID_ */ | ||
diff --git a/toxrtp/toxrtp_helper.c b/toxrtp/toxrtp_helper.c deleted file mode 100644 index 6f952359..00000000 --- a/toxrtp/toxrtp_helper.c +++ /dev/null | |||
@@ -1,208 +0,0 @@ | |||
1 | /* rtp_helper.c | ||
2 | * | ||
3 | * Has some standard functions. !Red! | ||
4 | * | ||
5 | * | ||
6 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
7 | * | ||
8 | * This file is part of Tox. | ||
9 | * | ||
10 | * Tox is free software: you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation, either version 3 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * Tox is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | |||
26 | |||
27 | #ifdef HAVE_CONFIG_H | ||
28 | #include "config.h" | ||
29 | #endif /* HAVE_CONFIG_H */ | ||
30 | |||
31 | #include "toxrtp_helper.h" | ||
32 | #include "../toxcore/network.h" | ||
33 | |||
34 | #include <assert.h> | ||
35 | |||
36 | #ifdef WIN | ||
37 | #include <windows.h> | ||
38 | #endif /* WIN */ | ||
39 | |||
40 | |||
41 | static int _seed = 0; /* Not initiated */ | ||
42 | |||
43 | int t_setipport ( const char *_ip, unsigned short _port, void *_dest ) | ||
44 | { | ||
45 | assert(_dest); | ||
46 | |||
47 | IP_Port *_dest_c = ( IP_Port * ) _dest; | ||
48 | ip_init(&_dest_c->ip, 0); | ||
49 | |||
50 | IP_Port _ipv6_garbage; | ||
51 | |||
52 | if ( !addr_resolve(_ip, &_dest_c->ip, &_ipv6_garbage.ip) ) | ||
53 | return FAILURE; | ||
54 | |||
55 | _dest_c->port = htons ( _port ); | ||
56 | |||
57 | return SUCCESS; | ||
58 | } | ||
59 | |||
60 | uint32_t t_random ( uint32_t _max ) | ||
61 | { | ||
62 | if ( !_seed ) { | ||
63 | srand ( t_time() ); | ||
64 | _seed++; | ||
65 | } | ||
66 | |||
67 | if ( _max <= 0 ) { | ||
68 | return ( unsigned ) rand(); | ||
69 | } else { | ||
70 | return ( unsigned ) rand() % _max; | ||
71 | } | ||
72 | } | ||
73 | |||
74 | void t_memcpy ( uint8_t *_dest, const uint8_t *_source, size_t _size ) | ||
75 | { | ||
76 | /* | ||
77 | * Using countdown to zero method | ||
78 | * It's faster than for(_it = 0; _it < _size; _it++); | ||
79 | */ | ||
80 | size_t _it = _size; | ||
81 | |||
82 | do { | ||
83 | _it--; | ||
84 | _dest[_it] = _source[_it]; | ||
85 | } while ( _it ); | ||
86 | |||
87 | } | ||
88 | |||
89 | uint8_t *t_memset ( uint8_t *_dest, uint8_t _valu, size_t _size ) | ||
90 | { | ||
91 | /* | ||
92 | * Again using countdown to zero method | ||
93 | */ | ||
94 | size_t _it = _size; | ||
95 | |||
96 | do { | ||
97 | _it--; | ||
98 | _dest[_it] = _valu; | ||
99 | } while ( _it ); | ||
100 | |||
101 | return _dest; | ||
102 | } | ||
103 | |||
104 | size_t t_memlen ( const uint8_t *_valu) | ||
105 | { | ||
106 | const uint8_t *_it; | ||
107 | size_t _retu = 0; | ||
108 | |||
109 | for ( _it = _valu; *_it; ++_it ) ++_retu; | ||
110 | |||
111 | return _retu; | ||
112 | } | ||
113 | |||
114 | uint8_t *t_strallcpy ( const uint8_t *_source ) /* string alloc and copy */ | ||
115 | { | ||
116 | assert(_source); | ||
117 | |||
118 | size_t _length = t_memlen(_source) + 1; /* make space for null character */ | ||
119 | |||
120 | uint8_t *_dest = calloc( sizeof ( uint8_t ), _length ); | ||
121 | assert(_dest); | ||
122 | |||
123 | t_memcpy(_dest, _source, _length); | ||
124 | |||
125 | return _dest; | ||
126 | } | ||
127 | |||
128 | size_t t_strfind ( const uint8_t *_str, const uint8_t *_substr ) | ||
129 | { | ||
130 | size_t _pos = 0; | ||
131 | size_t _it, _delit = 0; | ||
132 | |||
133 | for ( _it = 0; _str[_it] != '\0'; _it++ ) { | ||
134 | if ( _str[_it] == _substr[_delit] ) { | ||
135 | _pos = _it; | ||
136 | |||
137 | while ( _str[_it] == _substr[_delit] && _str[_it] != '\0' ) { | ||
138 | _it ++; | ||
139 | _delit++; | ||
140 | |||
141 | if ( _substr[_delit] == '\0' ) { | ||
142 | return _pos; | ||
143 | } | ||
144 | } | ||
145 | |||
146 | _delit = 0; | ||
147 | _pos = 0; | ||
148 | } | ||
149 | } | ||
150 | |||
151 | return _pos; | ||
152 | } | ||
153 | |||
154 | #ifdef WIN | ||
155 | #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) | ||
156 | #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 | ||
157 | #else | ||
158 | #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL | ||
159 | #endif | ||
160 | |||
161 | struct timezone { | ||
162 | int tz_minuteswest; /* minutes W of Greenwich */ | ||
163 | int tz_dsttime; /* type of dst correction */ | ||
164 | }; | ||
165 | |||
166 | int gettimeofday(struct timeval *tv, struct timezone *tz) | ||
167 | { | ||
168 | FILETIME ft; | ||
169 | unsigned __int64 tmpres = 0; | ||
170 | static int tzflag; | ||
171 | |||
172 | if (NULL != tv) { | ||
173 | GetSystemTimeAsFileTime(&ft); | ||
174 | |||
175 | tmpres |= ft.dwHighDateTime; | ||
176 | tmpres <<= 32; | ||
177 | tmpres |= ft.dwLowDateTime; | ||
178 | |||
179 | /*converting file time to unix epoch*/ | ||
180 | tmpres -= DELTA_EPOCH_IN_MICROSECS; | ||
181 | tmpres /= 10; /*convert into microseconds*/ | ||
182 | tv->tv_sec = (long)(tmpres / 1000000UL); | ||
183 | tv->tv_usec = (long)(tmpres % 1000000UL); | ||
184 | } | ||
185 | |||
186 | if (NULL != tz) { | ||
187 | if (!tzflag) { | ||
188 | _tzset(); | ||
189 | tzflag++; | ||
190 | } | ||
191 | |||
192 | tz->tz_minuteswest = _timezone / 60; | ||
193 | tz->tz_dsttime = _daylight; | ||
194 | } | ||
195 | |||
196 | return 0; | ||
197 | } | ||
198 | #endif /* WIN */ | ||
199 | |||
200 | |||
201 | uint64_t t_time() | ||
202 | { | ||
203 | struct timeval _tv; | ||
204 | gettimeofday(&_tv, NULL); | ||
205 | uint64_t _retu_usec = _tv.tv_sec % 1000000; /* get 6 digits an leave space for 3 more */ | ||
206 | _retu_usec = _retu_usec * 1000 + (_tv.tv_usec / 1000 ); | ||
207 | return _retu_usec; | ||
208 | } | ||
diff --git a/toxrtp/toxrtp_helper.h b/toxrtp/toxrtp_helper.h deleted file mode 100644 index c9bcfcca..00000000 --- a/toxrtp/toxrtp_helper.h +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | /* rtp_helper.h | ||
2 | * | ||
3 | * Has some standard functions. !Red! | ||
4 | * | ||
5 | * | ||
6 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
7 | * | ||
8 | * This file is part of Tox. | ||
9 | * | ||
10 | * Tox is free software: you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation, either version 3 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * Tox is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifndef _RTP__HELPER_H_ | ||
26 | #define _RTP__HELPER_H_ | ||
27 | |||
28 | #include <time.h> | ||
29 | #include <inttypes.h> | ||
30 | |||
31 | /* Current time, unix format */ | ||
32 | /*#define _time ((uint32_t)time(NULL))*/ | ||
33 | |||
34 | #define SUCCESS 0 | ||
35 | #define FAILURE -1 | ||
36 | |||
37 | #define _USE_ERRORS | ||
38 | |||
39 | #define RUN_IN_THREAD(_func, _thread_id, _arg_ptr) \ | ||
40 | if ( pthread_create ( &_thread_id, NULL, _func, _arg_ptr ) ) { \ | ||
41 | pthread_detach ( _thread_id ); \ | ||
42 | } | ||
43 | |||
44 | /* Core adaptation helper */ | ||
45 | int t_setipport ( const char* _ip, unsigned short _port, void* _cont ); | ||
46 | uint32_t t_random ( uint32_t _max ); | ||
47 | |||
48 | /* It's a bit faster than the memcpy it self and more optimized for using | ||
49 | * a uint8_t since memcpy has optimizations when copying "words" i.e. long type. | ||
50 | * Otherwise it just copies char's while we need only uint8_t | ||
51 | */ | ||
52 | void t_memcpy ( uint8_t* _dest, const uint8_t* _source, size_t _size ); | ||
53 | |||
54 | |||
55 | /* This is our memset. It's also a bit faster than the memset for it | ||
56 | * does not cast _dest to char* and uses faster loop algorithm. | ||
57 | */ | ||
58 | uint8_t* t_memset ( uint8_t* _dest, uint8_t _valu, size_t _size ); | ||
59 | |||
60 | /* Get null terminated len */ | ||
61 | size_t t_memlen ( const uint8_t* _valu ); | ||
62 | |||
63 | /* finds location of substring */ | ||
64 | size_t t_strfind ( const uint8_t* _str, const uint8_t* _substr ); | ||
65 | |||
66 | /* string alloc and copy ( ! must be null terminated ) */ | ||
67 | uint8_t* t_strallcpy ( const uint8_t* _source ); | ||
68 | |||
69 | /* Get current time in milliseconds */ | ||
70 | uint64_t t_time(); | ||
71 | |||
72 | |||
73 | #endif /* _RTP__HELPER_H_ */ | ||
74 | |||
75 | |||
76 | |||
77 | |||
diff --git a/toxrtp/toxrtp_message.c b/toxrtp/toxrtp_message.c deleted file mode 100644 index e7f1f2c0..00000000 --- a/toxrtp/toxrtp_message.c +++ /dev/null | |||
@@ -1,351 +0,0 @@ | |||
1 | /* rtp_message.c | ||
2 | * | ||
3 | * Rtp Message handler. It handles message/header parsing. | ||
4 | * Refer to RTP: A Transport Protocol for Real-Time Applications ( RFC 3550 ) for more info. !Red! | ||
5 | * | ||
6 | * | ||
7 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
8 | * | ||
9 | * This file is part of Tox. | ||
10 | * | ||
11 | * Tox is free software: you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License as published by | ||
13 | * the Free Software Foundation, either version 3 of the License, or | ||
14 | * (at your option) any later version. | ||
15 | * | ||
16 | * Tox is distributed in the hope that it will be useful, | ||
17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
19 | * GNU General Public License for more details. | ||
20 | * | ||
21 | * You should have received a copy of the GNU General Public License | ||
22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
23 | * | ||
24 | */ | ||
25 | |||
26 | #ifdef HAVE_CONFIG_H | ||
27 | #include "config.h" | ||
28 | #endif /* HAVE_CONFIG_H */ | ||
29 | |||
30 | #include "toxrtp_message.h" | ||
31 | #include "toxrtp.h" | ||
32 | #include <stdio.h> | ||
33 | |||
34 | #ifdef _USE_ERRORS | ||
35 | #include "toxrtp_error_id.h" | ||
36 | #endif /* _USE_ERRORS */ | ||
37 | |||
38 | #include <assert.h> | ||
39 | |||
40 | /* Some defines */ | ||
41 | |||
42 | /* End of defines */ | ||
43 | |||
44 | void rtp_header_print (const rtp_header_t* _header) | ||
45 | { | ||
46 | printf("Header: \n" | ||
47 | "Version: %d\n" | ||
48 | "Padding: %d\n" | ||
49 | "Ext: %d\n" | ||
50 | "CC: %d\n" | ||
51 | "marker: %d\n" | ||
52 | "payload typ:%d\n\n" | ||
53 | "sequ num: %d\n" | ||
54 | "Timestamp: %d\n" | ||
55 | "SSrc: %d\n" | ||
56 | "CSrc: %d\n" | ||
57 | "Lenght: %d\n" | ||
58 | ,rtp_header_get_flag_version(_header) | ||
59 | ,rtp_header_get_flag_padding(_header) | ||
60 | ,rtp_header_get_flag_extension(_header) | ||
61 | ,rtp_header_get_flag_CSRC_count(_header) | ||
62 | ,rtp_header_get_setting_marker(_header) | ||
63 | ,rtp_header_get_setting_payload_type(_header) | ||
64 | ,_header->_sequence_number | ||
65 | ,_header->_timestamp | ||
66 | ,_header->_ssrc | ||
67 | ,_header->_csrc[0] | ||
68 | ,_header->_length | ||
69 | ); | ||
70 | } | ||
71 | |||
72 | rtp_header_t* rtp_extract_header ( const uint8_t* _payload, size_t _bytes ) | ||
73 | { | ||
74 | if ( !_payload ) { | ||
75 | t_perror ( RTP_ERROR_PAYLOAD_NULL ); | ||
76 | return NULL; | ||
77 | } | ||
78 | const uint8_t* _it = _payload; | ||
79 | |||
80 | rtp_header_t* _retu = calloc(sizeof(rtp_header_t), 1); | ||
81 | assert(_retu); | ||
82 | |||
83 | _retu->_flags = *_it; ++_it; | ||
84 | |||
85 | /* This indicates if the first 2 bytes are valid. | ||
86 | * Now it my happen that this is out of order but | ||
87 | * it cuts down chances of parsing some invalid value | ||
88 | */ | ||
89 | if ( rtp_header_get_flag_version(_retu) != RTP_VERSION ){ | ||
90 | printf("Invalid version: %d\n", rtp_header_get_flag_version(_retu)); | ||
91 | //assert(rtp_header_get_flag_version(_retu) == RTP_VERSION); | ||
92 | /* Deallocate */ | ||
93 | //DEALLOCATOR(_retu); | ||
94 | //return NULL; | ||
95 | } | ||
96 | |||
97 | /* | ||
98 | * Added a check for the size of the header little sooner so | ||
99 | * I don't need to parse the other stuff if it's bad | ||
100 | */ | ||
101 | uint8_t cc = rtp_header_get_flag_CSRC_count ( _retu ); | ||
102 | uint32_t _lenght = _MIN_HEADER_LENGTH + ( cc * 4 ); | ||
103 | |||
104 | if ( _bytes < _lenght ) { | ||
105 | t_perror ( RTP_ERROR_PAYLOAD_INVALID ); | ||
106 | return NULL; | ||
107 | } | ||
108 | |||
109 | if ( cc > 0 ) { | ||
110 | _retu->_csrc = calloc ( sizeof ( uint32_t ), cc ); | ||
111 | assert(_retu->_csrc); | ||
112 | |||
113 | } else { /* But this should not happen ever */ | ||
114 | t_perror ( RTP_ERROR_HEADER_PARSING ); | ||
115 | return NULL; | ||
116 | } | ||
117 | |||
118 | |||
119 | _retu->_marker_payload_t = *_it; ++_it; | ||
120 | _retu->_length = _lenght; | ||
121 | _retu->_sequence_number = ( ( uint16_t ) * _it << 8 ) | * ( _it + 1 ); | ||
122 | |||
123 | _it += 2; | ||
124 | |||
125 | _retu->_timestamp = ( ( uint32_t ) * _it << 24 ) | | ||
126 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
127 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
128 | ( * ( _it + 3 ) ) ; | ||
129 | |||
130 | _it += 4; | ||
131 | |||
132 | _retu->_ssrc = ( ( uint32_t ) * _it << 24 ) | | ||
133 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
134 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
135 | ( ( uint32_t ) * ( _it + 3 ) ) ; | ||
136 | |||
137 | |||
138 | size_t x; | ||
139 | for ( x = 0; x < cc; x++ ) { | ||
140 | _it += 4; | ||
141 | _retu->_csrc[x] = ( ( uint32_t ) * _it << 24 ) | | ||
142 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
143 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
144 | ( ( uint32_t ) * ( _it + 3 ) ) ; | ||
145 | } | ||
146 | |||
147 | return _retu; | ||
148 | } | ||
149 | |||
150 | rtp_ext_header_t* rtp_extract_ext_header ( const uint8_t* _payload, size_t _bytes ) | ||
151 | { | ||
152 | if ( !_payload ) { | ||
153 | t_perror ( RTP_ERROR_PAYLOAD_NULL ); | ||
154 | return NULL; | ||
155 | } | ||
156 | |||
157 | |||
158 | |||
159 | const uint8_t* _it = _payload; | ||
160 | |||
161 | rtp_ext_header_t* _retu = calloc(sizeof(rtp_ext_header_t), 1); | ||
162 | assert(_retu); | ||
163 | |||
164 | uint16_t _ext_len = ( ( uint16_t ) * _it << 8 ) | * ( _it + 1 ); _it += 2; | ||
165 | |||
166 | if ( _bytes < ( _ext_len * sizeof(uint32_t) ) ) { | ||
167 | t_perror ( RTP_ERROR_PAYLOAD_INVALID ); | ||
168 | return NULL; | ||
169 | } | ||
170 | |||
171 | _retu->_ext_len = _ext_len; | ||
172 | _retu->_ext_type = ( ( uint16_t ) * _it << 8 ) | * ( _it + 1 ); _it -= 2; | ||
173 | |||
174 | _retu->_hd_ext = calloc(sizeof(uint32_t), _ext_len); | ||
175 | assert(_retu->_hd_ext); | ||
176 | |||
177 | uint32_t* _hd_ext = _retu->_hd_ext; | ||
178 | size_t i; | ||
179 | for ( i = 0; i < _ext_len; i++ ) { | ||
180 | _it += 4; | ||
181 | _hd_ext[i] = ( ( uint32_t ) * _it << 24 ) | | ||
182 | ( ( uint32_t ) * ( _it + 1 ) << 16 ) | | ||
183 | ( ( uint32_t ) * ( _it + 2 ) << 8 ) | | ||
184 | ( ( uint32_t ) * ( _it + 3 ) ) ; | ||
185 | } | ||
186 | |||
187 | return _retu; | ||
188 | } | ||
189 | |||
190 | uint8_t* rtp_add_header ( rtp_header_t* _header, uint8_t* _payload ) | ||
191 | { | ||
192 | uint8_t cc = rtp_header_get_flag_CSRC_count ( _header ); | ||
193 | |||
194 | uint8_t* _it = _payload; | ||
195 | |||
196 | *_it = _header->_flags; ++_it; | ||
197 | *_it = _header->_marker_payload_t; ++_it; | ||
198 | |||
199 | *_it = ( _header->_sequence_number >> 8 ); ++_it; | ||
200 | *_it = ( _header->_sequence_number ); ++_it; | ||
201 | |||
202 | uint32_t _timestamp = _header->_timestamp; | ||
203 | *_it = ( _timestamp >> 24 ); ++_it; | ||
204 | *_it = ( _timestamp >> 16 ); ++_it; | ||
205 | *_it = ( _timestamp >> 8 ); ++_it; | ||
206 | *_it = ( _timestamp ); ++_it; | ||
207 | |||
208 | uint32_t _ssrc = _header->_ssrc; | ||
209 | *_it = ( _ssrc >> 24 ); ++_it; | ||
210 | *_it = ( _ssrc >> 16 ); ++_it; | ||
211 | *_it = ( _ssrc >> 8 ); ++_it; | ||
212 | *_it = ( _ssrc ); | ||
213 | |||
214 | uint32_t *_csrc = _header->_csrc; | ||
215 | size_t x; | ||
216 | for ( x = 0; x < cc; x++ ) { | ||
217 | ++_it; | ||
218 | *_it = ( _csrc[x] >> 24 ); ++_it; | ||
219 | *_it = ( _csrc[x] >> 16 ); ++_it; | ||
220 | *_it = ( _csrc[x] >> 8 ); ++_it; | ||
221 | *_it = ( _csrc[x] ); | ||
222 | } | ||
223 | |||
224 | return _it; | ||
225 | } | ||
226 | |||
227 | uint8_t* rtp_add_extention_header ( rtp_ext_header_t* _header, uint8_t* _payload ) | ||
228 | { | ||
229 | uint8_t* _it = _payload; | ||
230 | |||
231 | *_it = ( _header->_ext_len >> 8 ); _it++; | ||
232 | *_it = ( _header->_ext_len ); _it++; | ||
233 | |||
234 | *_it = ( _header->_ext_type >> 8 ); ++_it; | ||
235 | *_it = ( _header->_ext_type ); | ||
236 | |||
237 | size_t x; | ||
238 | |||
239 | uint32_t* _hd_ext = _header->_hd_ext; | ||
240 | for ( x = 0; x < _header->_ext_len; x++ ) { | ||
241 | ++_it; | ||
242 | *_it = ( _hd_ext[x] >> 24 ); ++_it; | ||
243 | *_it = ( _hd_ext[x] >> 16 ); ++_it; | ||
244 | *_it = ( _hd_ext[x] >> 8 ); ++_it; | ||
245 | *_it = ( _hd_ext[x] ); | ||
246 | } | ||
247 | |||
248 | return _it; | ||
249 | } | ||
250 | |||
251 | size_t rtp_header_get_size ( const rtp_header_t* _header ) | ||
252 | { | ||
253 | return ( 8 + ( rtp_header_get_flag_CSRC_count ( _header ) * 4 ) ); | ||
254 | } | ||
255 | /* Setting flags */ | ||
256 | |||
257 | void rtp_header_add_flag_version ( rtp_header_t* _header, uint32_t value ) | ||
258 | { | ||
259 | ( _header->_flags ) &= 0x3F; | ||
260 | ( _header->_flags ) |= ( ( ( value ) << 6 ) & 0xC0 ); | ||
261 | } | ||
262 | |||
263 | void rtp_header_add_flag_padding ( rtp_header_t* _header, uint32_t value ) | ||
264 | { | ||
265 | if ( value > 0 ) { | ||
266 | value = 1; /* It can only be 1 */ | ||
267 | } | ||
268 | |||
269 | ( _header->_flags ) &= 0xDF; | ||
270 | ( _header->_flags ) |= ( ( ( value ) << 5 ) & 0x20 ); | ||
271 | } | ||
272 | |||
273 | void rtp_header_add_flag_extension ( rtp_header_t* _header, uint32_t value ) | ||
274 | { | ||
275 | if ( value > 0 ) { | ||
276 | value = 1; /* It can only be 1 */ | ||
277 | } | ||
278 | |||
279 | ( _header->_flags ) &= 0xEF; | ||
280 | ( _header->_flags ) |= ( ( ( value ) << 4 ) & 0x10 ); | ||
281 | } | ||
282 | |||
283 | void rtp_header_add_flag_CSRC_count ( rtp_header_t* _header, uint32_t value ) | ||
284 | { | ||
285 | ( _header->_flags ) &= 0xF0; | ||
286 | ( _header->_flags ) |= ( ( value ) & 0x0F ); | ||
287 | } | ||
288 | |||
289 | void rtp_header_add_setting_marker ( rtp_header_t* _header, uint32_t value ) | ||
290 | { | ||
291 | if ( value > 1 ) | ||
292 | value = 1; | ||
293 | |||
294 | ( _header->_marker_payload_t ) &= 0x7F; | ||
295 | ( _header->_marker_payload_t ) |= ( ( ( value ) << 7 ) /*& 0x80 */ ); | ||
296 | } | ||
297 | |||
298 | void rtp_header_add_setting_payload ( rtp_header_t* _header, uint32_t value ) | ||
299 | { | ||
300 | if ( value > 127 ) | ||
301 | value = 127; /* Well set to maximum */ | ||
302 | |||
303 | ( _header->_marker_payload_t ) &= 0x80; | ||
304 | ( _header->_marker_payload_t ) |= ( ( value ) /* & 0x7F */ ); | ||
305 | } | ||
306 | |||
307 | /* Getting values from flags */ | ||
308 | uint8_t rtp_header_get_flag_version ( const rtp_header_t* _header ) | ||
309 | { | ||
310 | return ( _header->_flags & 0xd0 ) >> 6; | ||
311 | } | ||
312 | |||
313 | uint8_t rtp_header_get_flag_padding ( const rtp_header_t* _header ) | ||
314 | { | ||
315 | return ( _header->_flags & 0x20 ) >> 5; | ||
316 | } | ||
317 | |||
318 | uint8_t rtp_header_get_flag_extension ( const rtp_header_t* _header ) | ||
319 | { | ||
320 | return ( _header->_flags & 0x10 ) >> 4; | ||
321 | } | ||
322 | |||
323 | uint8_t rtp_header_get_flag_CSRC_count ( const rtp_header_t* _header ) | ||
324 | { | ||
325 | return ( _header->_flags & 0x0f ); | ||
326 | } | ||
327 | uint8_t rtp_header_get_setting_marker ( const rtp_header_t* _header ) | ||
328 | { | ||
329 | return ( _header->_marker_payload_t ) >> 7; | ||
330 | } | ||
331 | uint8_t rtp_header_get_setting_payload_type ( const rtp_header_t* _header ) | ||
332 | { | ||
333 | /* | ||
334 | uint8_t _retu; | ||
335 | |||
336 | if ( _header->_marker_payload_t >> 7 == 1 ) { | ||
337 | _header->_marker_payload_t ^= 0x80; | ||
338 | _retu = _header->_marker_payload_t; | ||
339 | _header->_marker_payload_t ^= 0x80; | ||
340 | } else { | ||
341 | _retu = _header->_marker_payload_t; | ||
342 | } | ||
343 | */ | ||
344 | /* return to start value | ||
345 | return _retu; */ | ||
346 | return _header->_marker_payload_t & 0x7f; | ||
347 | } | ||
348 | |||
349 | /* */ | ||
350 | |||
351 | |||
diff --git a/toxrtp/toxrtp_message.h b/toxrtp/toxrtp_message.h deleted file mode 100644 index 8feea5d9..00000000 --- a/toxrtp/toxrtp_message.h +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | /* rtp_message.h | ||
2 | * | ||
3 | * Rtp Message handler. It handles message/header parsing. | ||
4 | * Refer to RTP: A Transport Protocol for Real-Time Applications ( RFC 3550 ) for more info. !Red! | ||
5 | * | ||
6 | * | ||
7 | * Copyright (C) 2013 Tox project All Rights Reserved. | ||
8 | * | ||
9 | * This file is part of Tox. | ||
10 | * | ||
11 | * Tox is free software: you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License as published by | ||
13 | * the Free Software Foundation, either version 3 of the License, or | ||
14 | * (at your option) any later version. | ||
15 | * | ||
16 | * Tox is distributed in the hope that it will be useful, | ||
17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
19 | * GNU General Public License for more details. | ||
20 | * | ||
21 | * You should have received a copy of the GNU General Public License | ||
22 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. | ||
23 | * | ||
24 | */ | ||
25 | |||
26 | #ifndef _RTP__MESSAGE_H_ | ||
27 | #define _RTP__MESSAGE_H_ | ||
28 | |||
29 | #include "../toxcore/network.h" | ||
30 | #include "toxrtp_helper.h" | ||
31 | #include "../toxcore/tox.h" | ||
32 | /* Defines */ | ||
33 | |||
34 | #define _MAX_SEQU_NUM 65535 | ||
35 | |||
36 | /* Minimum size */ | ||
37 | #define _MIN_HEADER_LENGTH 12 | ||
38 | #define _MIN_EXT_HEADER_LENGTH 4 | ||
39 | |||
40 | /* End of defines */ | ||
41 | |||
42 | |||
43 | typedef struct rtp_dest_list_s { | ||
44 | tox_IP_Port _dest; | ||
45 | struct rtp_dest_list_s* next; | ||
46 | |||
47 | } rtp_dest_list_t; | ||
48 | |||
49 | typedef struct rtp_header_s { | ||
50 | uint8_t _flags; /* Version(2),Padding(1), Ext(1), Cc(4) */ | ||
51 | uint8_t _marker_payload_t; /* Marker(1), PlayLoad Type(7) */ | ||
52 | uint16_t _sequence_number; /* Sequence Number */ | ||
53 | uint32_t _timestamp; /* Timestamp */ | ||
54 | uint32_t _ssrc; /* SSRC */ | ||
55 | uint32_t* _csrc; /* CSRC's table */ | ||
56 | |||
57 | uint32_t _length; /* A little something for allocation */ | ||
58 | |||
59 | } rtp_header_t; | ||
60 | |||
61 | typedef struct rtp_ext_header_s { | ||
62 | uint16_t _ext_type; /* Extension profile */ | ||
63 | uint16_t _ext_len; /* Number of extensions */ | ||
64 | uint32_t* _hd_ext; /* Extension's table */ | ||
65 | |||
66 | |||
67 | } rtp_ext_header_t; | ||
68 | |||
69 | typedef struct rtp_msg_s { | ||
70 | struct rtp_header_s* _header; | ||
71 | struct rtp_ext_header_s* _ext_header; | ||
72 | uint32_t _header_lenght; | ||
73 | |||
74 | uint8_t* _data; | ||
75 | uint32_t _length; | ||
76 | tox_IP_Port _from; | ||
77 | |||
78 | struct rtp_msg_s* _next; | ||
79 | } rtp_msg_t; | ||
80 | |||
81 | /* Extracts the header from the payload starting at _from */ | ||
82 | rtp_header_t* rtp_extract_header ( const uint8_t* _payload, size_t _bytes ); | ||
83 | rtp_ext_header_t* rtp_extract_ext_header ( const uint8_t* _payload, size_t _bytes ); | ||
84 | |||
85 | |||
86 | uint8_t* rtp_add_header ( rtp_header_t* _header, uint8_t* _payload ); | ||
87 | uint8_t* rtp_add_extention_header ( rtp_ext_header_t* _header, uint8_t* _payload ); | ||
88 | |||
89 | /* Gets the size of the header _header in bytes */ | ||
90 | size_t rtp_header_get_size ( const rtp_header_t* _header ); | ||
91 | |||
92 | void rtp_header_print (const rtp_header_t* _header); | ||
93 | |||
94 | /* Adding flags and settings */ | ||
95 | void rtp_header_add_flag_version ( rtp_header_t* _header, uint32_t value ); | ||
96 | void rtp_header_add_flag_padding ( rtp_header_t* _header, uint32_t value ); | ||
97 | void rtp_header_add_flag_extension ( rtp_header_t* _header, uint32_t value ); | ||
98 | void rtp_header_add_flag_CSRC_count ( rtp_header_t* _header, uint32_t value ); | ||
99 | void rtp_header_add_setting_marker ( rtp_header_t* _header, uint32_t value ); | ||
100 | void rtp_header_add_setting_payload ( rtp_header_t* _header, uint32_t value ); | ||
101 | |||
102 | |||
103 | /* Getting values from flags and settings */ | ||
104 | uint8_t rtp_header_get_flag_version ( const rtp_header_t* _header ); | ||
105 | uint8_t rtp_header_get_flag_padding ( const rtp_header_t* _header ); | ||
106 | uint8_t rtp_header_get_flag_extension ( const rtp_header_t* _header ); | ||
107 | uint8_t rtp_header_get_flag_CSRC_count ( const rtp_header_t* _header ); | ||
108 | uint8_t rtp_header_get_setting_marker ( const rtp_header_t* _header ); | ||
109 | uint8_t rtp_header_get_setting_payload_type ( const rtp_header_t* _header ); | ||
110 | |||
111 | #endif /* _RTP__MESSAGE_H_ */ | ||