]> git.pld-linux.org Git - packages/twinkle.git/blame - twinkle-ucommon.patch
projects / packages / twinkle.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- all bits needed to build with webrtc-libilbc
[packages/twinkle.git] / twinkle-ucommon.patch
CommitLineData
7efbe1a1
AM		 1Index: twinkle-1.4.2/configure.in
2===================================================================
3--- twinkle-1.4.2.orig/configure.in 2009-02-24 20:49:20.000000000 +0100
4+++ twinkle-1.4.2/configure.in 2011-09-27 12:33:39.787913055 +0200
5@@ -47,7 +47,7 @@ AC_CHECK_HEADERS([linux/errqueue.h],[],[
6
7 # Check version of the Common C++ library.
8 # This also sets the cc++2 include directory in CXXFLAGS
9-OST_CCXX2_VERSION(1.6.0,,exit)
10+#OST_CCXX2_VERSION(1.6.0,,exit)
11
12 # Temporarily add some default directories to PKG_CONFIG_PATH such that
13 # the user will not be burdened with setting PKG_CONFIG_PATH
14@@ -66,7 +66,9 @@ fi
15
16 export PKG_CONFIG_PATH
17
18-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
19+PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0)
20+PKG_CHECK_MODULES(UCOMMON, ucommon >= 5.0.0)
21+CCRTP_LIBS="$CCRTP_LIBS $UCOMMON_LIBS"
22
23 PKG_CHECK_MODULES(XML2, libxml-2.0)
24 # AC_CHECK_HEADER(libxml/tree.h, [],
25@@ -136,7 +138,7 @@ done
26 #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
27 # libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
28 # should include above flags !
29-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
30+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
31 echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
32
33 # get libraries specified on command line
34@@ -144,6 +146,7 @@ echo $LDFLAGS | xargs echo LIBS += >> $Q
35
36 echo "LIBS += `$CCGNU2_CONFIG --stdlibs`" >> $QT_INCL_PRO
37 echo "LIBS += $CCRTP_LIBS" >> $QT_INCL_PRO
38+echo "LIBS += $UCOMMON_LIBS" >> $QT_INCL_PRO
39 echo "LIBS += $XML2_LIBS" >> $QT_INCL_PRO
40
41 # Check if KDE is available
42@@ -264,7 +267,7 @@ fi
43 # Check if zrtp is available
44 if test "x$ac_cv_zrtp" = "xyes"
45 then
46- PKG_CHECK_MODULES(ZRTP, libzrtpcpp >= 1.3.0)
47+ PKG_CHECK_MODULES(ZRTP, libzrtpcpp >= 2.0.0)
48 AC_CHECK_LIB(zrtpcpp, main, [
49 AC_CHECK_HEADER(libzrtpcpp/ZrtpQueue.h, [],
50 [AC_MSG_ERROR([zrtp header files missing])])
51Index: twinkle-1.4.2/src/audio/audio_decoder.h
52===================================================================
53--- twinkle-1.4.2.orig/src/audio/audio_decoder.h 2009-01-03 17:53:58.000000000 +0100
54+++ twinkle-1.4.2/src/audio/audio_decoder.h 2011-09-27 12:33:39.790913085 +0200
55@@ -21,7 +21,6 @@
56 #ifndef _AUDIO_DECODER_H
57 #define _AUDIO_DECODER_H
58
59-#include <cc++/config.h>
60 #include "twinkle_config.h"
61 #include "audio_codecs.h"
62 #include "user.h"
63Index: twinkle-1.4.2/src/audio/audio_encoder.h
64===================================================================
65--- twinkle-1.4.2.orig/src/audio/audio_encoder.h 2009-01-03 17:53:58.000000000 +0100
66+++ twinkle-1.4.2/src/audio/audio_encoder.h 2011-09-27 12:33:39.790913085 +0200
67@@ -21,7 +21,6 @@
68 #ifndef _AUDIO_ENCODER_H
69 #define _AUDIO_ENCODER_H
70
71-#include <cc++/config.h>
72 #include "twinkle_config.h"
73 #include "audio_codecs.h"
74 #include "user.h"
75Index: twinkle-1.4.2/src/audio/audio_rx.cpp
76===================================================================
77--- twinkle-1.4.2.orig/src/audio/audio_rx.cpp 2009-01-31 13:05:53.000000000 +0100
78+++ twinkle-1.4.2/src/audio/audio_rx.cpp 2011-09-27 12:33:39.791913095 +0200
79@@ -22,7 +22,6 @@
80 #include <cstdlib>
81 #include <sys/types.h>
82 #include <sys/time.h>
83-#include <cc++/config.h>
84
85 #include "audio_rx.h"
86 #include "log.h"
87Index: twinkle-1.4.2/src/audio/dtmf_player.h
88===================================================================
89--- twinkle-1.4.2.orig/src/audio/dtmf_player.h 2009-01-03 17:53:58.000000000 +0100
90+++ twinkle-1.4.2/src/audio/dtmf_player.h 2011-09-27 12:33:39.791913095 +0200
91@@ -21,7 +21,6 @@
92 #ifndef _DTMF_PLAYER_H
93 #define _DTMF_PLAYER_H
94
95-#include <cc++/config.h>
96 #include "twinkle_config.h"
97 #include "audio_encoder.h"
98 #include "freq_gen.h"
99Index: twinkle-1.4.2/src/audio/freq_gen.h
100===================================================================
101--- twinkle-1.4.2.orig/src/audio/freq_gen.h 2009-01-03 17:53:58.000000000 +0100
102+++ twinkle-1.4.2/src/audio/freq_gen.h 2011-09-27 12:33:39.791913095 +0200
103@@ -26,7 +26,7 @@
104 #define _FREQ_GEN_H
105
106 #include <vector>
107-#include <cc++/config.h>
108+#include <commoncpp/config.h>
109
110 using namespace std;
111
112Index: twinkle-1.4.2/src/audio/tone_gen.h
113===================================================================
114--- twinkle-1.4.2.orig/src/audio/tone_gen.h 2009-01-03 17:53:58.000000000 +0100
115+++ twinkle-1.4.2/src/audio/tone_gen.h 2011-09-27 12:33:39.792913104 +0200
116@@ -21,7 +21,6 @@
117
118 #include <string>
119 #include <fstream>
120-#include <cc++/config.h>
121 #include <sndfile.h>
122 #include "sys_settings.h"
123 #include "threads/mutex.h"
124Index: twinkle-1.4.2/src/call_script.h
125===================================================================
126--- twinkle-1.4.2.orig/src/call_script.h 2009-01-03 17:54:01.000000000 +0100
127+++ twinkle-1.4.2/src/call_script.h 2011-09-27 12:33:39.792913104 +0200
128@@ -65,7 +65,6 @@
129
130 #include <vector>
131 #include <string>
132-#include <cc++/config.h>
133 #include "user.h"
134 #include "parser/request.h"
135
136Index: twinkle-1.4.2/src/log.cpp
137===================================================================
138--- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 15:35:28.000000000 +0100
139+++ twinkle-1.4.2/src/log.cpp 2011-09-27 12:33:39.792913104 +0200
140@@ -40,6 +40,7 @@ void *main_logview(void *arg) {
141 // TODO: handle situation where log file was zapped.
142 if (ui) ui->cb_log_updated(false);
143 }
144+ return NULL;
145 }
146
147 bool t_log::move_current_to_old(void) {
148@@ -161,7 +162,7 @@ void t_log::write_header(const string &f
149
150 gettimeofday(&t, NULL);
151 date = t.tv_sec;
152- localtime_r(&date, &tm);
153+ ::localtime_r(&date, &tm);
154
155 *log_stream << "+++ ";
156 *log_stream << tm.tm_mday;
157Index: twinkle-1.4.2/src/mwi/mwi_dialog.cpp
158===================================================================
159--- twinkle-1.4.2.orig/src/mwi/mwi_dialog.cpp 2009-01-03 17:54:03.000000000 +0100
160+++ twinkle-1.4.2/src/mwi/mwi_dialog.cpp 2011-09-27 12:33:39.793913113 +0200
161@@ -32,4 +32,5 @@ t_mwi_dialog::t_mwi_dialog(t_phone_user
162 t_mwi_dialog *t_mwi_dialog::copy(void) {
163 // Copy is not needed.
164 assert(false);
165+ return NULL;
166 }
167Index: twinkle-1.4.2/src/mwi/simple_msg_sum_body.h
168===================================================================
169--- twinkle-1.4.2.orig/src/mwi/simple_msg_sum_body.h 2009-01-03 17:53:57.000000000 +0100
170+++ twinkle-1.4.2/src/mwi/simple_msg_sum_body.h 2011-09-27 12:33:39.793913113 +0200
171@@ -26,7 +26,6 @@
172
173 #include <string>
174 #include <map>
175-#include <cc++/config.h>
176 #include "parser/sip_body.h"
177 #include "sockets/url.h"
178
179Index: twinkle-1.4.2/src/parser/definitions.cpp
180===================================================================
181--- twinkle-1.4.2.orig/src/parser/definitions.cpp 2009-01-03 17:54:07.000000000 +0100
182+++ twinkle-1.4.2/src/parser/definitions.cpp 2011-09-27 12:33:39.793913113 +0200
183@@ -38,6 +38,7 @@ string method2str(const t_method &m, con
184 case METHOD_UNKNOWN: return unknown;
185 default: assert(false);
186 }
187+ return unknown;
188 }
189
190 t_method str2method(const string &s) {
191Index: twinkle-1.4.2/src/parser/request.cpp
192===================================================================
193--- twinkle-1.4.2.orig/src/parser/request.cpp 2009-01-18 15:06:11.000000000 +0100
194+++ twinkle-1.4.2/src/parser/request.cpp 2011-09-27 12:33:39.794913123 +0200
195@@ -23,9 +23,11 @@
196 #include "milenage.h"
197 #include "audits/memman.h"
198 #include <sstream>
199-#include <cc++/digest.h>
200+#include <ucommon/secure.h>
201
202-using namespace ost;
203+using namespace UCOMMON_NAMESPACE;
204+
205+// using namespace ost;
206
207 // AKAv1-MD5 algorithm specific helpers
208
209@@ -148,10 +150,10 @@ int b64_dec(const u8 * src, u8 * dst, in
210 // authentication with AKAv1-MD5 algorithm (RFC 3310)
211
212 bool t_request::authorize_akav1_md5(const t_digest_challenge &dchlg,
213- const string &username, const string &passwd, uint8 *op, uint8 *amf,
214+ const std::string &username, const std::string &passwd, uint8 *op, uint8 *amf,
215 unsigned long nc,
216- const string &cnonce, const string &qop, string &resp,
217- string &fail_reason) const
218+ const std::string &cnonce, const std::string &qop, std::string &resp,
219+ std::string &fail_reason) const
220 {
221 u8 nonce64[B64_DEC_SZ(dchlg.nonce.size())];
222 int len = b64_dec((const u8 *)dchlg.nonce.c_str(), nonce64, dchlg.nonce.size());
223@@ -183,7 +185,7 @@ bool t_request::authorize_akav1_md5(cons
224 for (i=0; i < AKA_SQNLEN; i++)
225 sqn[i] = sqnxoraka[i] ^ ak[i];
226
227- string res_str = string((char *)res, AKA_RESLEN);
228+ std::string res_str = std::string((char *)res, AKA_RESLEN);
229
230 return authorize_md5(dchlg, username, res_str, nc, cnonce, qop,
231 resp, fail_reason);
232@@ -192,11 +194,11 @@ bool t_request::authorize_akav1_md5(cons
233 // authentication with MD5 algorithm
234
235 bool t_request::authorize_md5(const t_digest_challenge &dchlg,
236- const string &username, const string &passwd, unsigned long nc,
237- const string &cnonce, const string &qop, string &resp,
238- string &fail_reason) const
239+ const std::string &username, const std::string &passwd, unsigned long nc,
240+ const std::string &cnonce, const std::string &qop, std::string &resp,
241+ std::string &fail_reason) const
242 {
243- string A1, A2;
244+ std::string A1, A2;
245 // RFC 2617 3.2.2.2
246 A1 = username + ":" + dchlg.realm + ":" + passwd;
247
248@@ -207,60 +209,51 @@ bool t_request::authorize_md5(const t_di
249 A2 = method2str(method, unknown_method) + ":" + uri.encode();
250 A2 += ":";
251 if (body) {
252- MD5Digest MD5body;
253- MD5body << body->encode();
254- ostringstream os;
255- os << MD5body;
256- A2 += os.str();
257+ digest_t MD5body = "md5";
258+ MD5body.puts(body->encode().c_str());
259+ A2 += std::string(MD5body.c_str());
260 } else {
261- MD5Digest MD5body;
262- MD5body << "";
263- ostringstream os;
264- os << MD5body;
265- A2 += os.str();
266+ digest_t MD5body = "md5";
267+ MD5body.puts("");
268+ A2 += std::string(MD5body.c_str());
269 }
270 }
271-
272 // RFC 2716 3.2.2.1
273 // Caculate digest
274- MD5Digest MD5A1;
275- MD5Digest MD5A2;
276- ostringstream HA1;
277- ostringstream HA2;
278-
279- MD5A1 << A1;
280- MD5A2 << A2;
281- HA1 << MD5A1;
282- HA2 << MD5A2;
283+ digest_t MD5A1 = "md5";
284+ digest_t MD5A2 = "md5";
285+
286+ MD5A1.puts(A1.c_str());
287+ MD5A2.puts(A2.c_str());
288
289- string x;
290+ std::string x;
291
292 if (cmp_nocase(qop, QOP_AUTH) == 0 || cmp_nocase(qop, QOP_AUTH_INT) == 0) {
293- x = HA1.str() + ":";
294+ x = std::string(MD5A1.c_str());
295+ x += ":";
296 x += dchlg.nonce + ":";
297 x += int2str(nc, "%08x") + ":";
298 x += cnonce + ":";
299 x += qop + ":";
300- x += HA2.str();
301+ x += std::string(MD5A2.c_str());
302 } else {
303- x = HA1.str() + ":";
304+ x = std::string(MD5A1.c_str());
305+ x += ":";
306 x += dchlg.nonce + ":";
307- x += HA2.str();
308+ x += std::string(MD5A2.c_str());
309 }
310
311- MD5Digest digest;
312- digest << x;
313- ostringstream dresp;
314- dresp << digest;
315+ digest_t digest = "md5";
316+ digest.puts(x.c_str());
317
318- resp = dresp.str();
319+ resp = std::string(digest.c_str());
320
321 return true;
322 }
323
324 bool t_request::authorize(const t_challenge &chlg, t_user *user_config,
325- const string &username, const string &passwd, unsigned long nc,
326- const string &cnonce, t_credentials &cr, string &fail_reason) const
327+ const std::string &username, const std::string &passwd, unsigned long nc,
328+ const std::string &cnonce, t_credentials &cr, std::string &fail_reason) const
329 {
330 // Only Digest authentication is supported
331 if (cmp_nocase(chlg.auth_scheme, AUTH_DIGEST) != 0) {
332@@ -271,17 +264,17 @@ bool t_request::authorize(const t_challe
333
334 const t_digest_challenge &dchlg = chlg.digest_challenge;
335
336- string qop = "";
337+ std::string qop = "";
338
339 // Determine QOP
340 // If both auth and auth-int are supported by the server, then
341 // choose auth to avoid problems with SIP ALGs. A SIP ALG rewrites
342 // the body of a message, thereby breaking auth-int authentication.
343 if (!dchlg.qop_options.empty()) {
344- const list<string>::const_iterator i = find(
345+ const list<std::string>::const_iterator i = find(
346 dchlg.qop_options.begin(), dchlg.qop_options.end(),
347 QOP_AUTH_INT);
348- const list<string>::const_iterator j = find(
349+ const list<std::string>::const_iterator j = find(
350 dchlg.qop_options.begin(), dchlg.qop_options.end(),
351 QOP_AUTH);
352 if (j != dchlg.qop_options.end())
353@@ -297,7 +290,7 @@ bool t_request::authorize(const t_challe
354 }
355
356 bool ret = false;
357- string resp;
358+ std::string resp;
359
360 if (cmp_nocase(dchlg.algorithm, ALG_MD5) == 0) {
361 ret = authorize_md5(dchlg, username, passwd, nc, cnonce,
362@@ -359,15 +352,15 @@ t_request::t_request(const t_method m) :
363 method = m;
364 }
365
366-void t_request::set_method(const string &s) {
367+void t_request::set_method(const std::string &s) {
368 method = str2method(s);
369 if (method == METHOD_UNKNOWN) {
370 unknown_method = s;
371 }
372 }
373
374-string t_request::encode(bool add_content_length) {
375- string s;
376+std::string t_request::encode(bool add_content_length) {
377+ std::string s;
378
379 s = method2str(method, unknown_method) + ' ' + uri.encode();
380 s += " SIP/";
381@@ -377,9 +370,9 @@ string t_request::encode(bool add_conten
382 return s;
383 }
384
385-list<string> t_request::encode_env(void) {
386- string s;
387- list<string> l = t_sip_message::encode_env();
388+list<std::string> t_request::encode_env(void) {
389+ std::string s;
390+ list<std::string> l = t_sip_message::encode_env();
391
392 s = "SIPREQUEST_METHOD=";
393 s += method2str(method, unknown_method);
394@@ -431,7 +424,7 @@ void t_request::set_route(const t_url &t
395 }
396 }
397
398-t_response *t_request::create_response(int code, string reason) const
399+t_response *t_request::create_response(int code, std::string reason) const
400 {
401 t_response *r;
402
403@@ -458,7 +451,7 @@ t_response *t_request::create_response(i
404 return r;
405 }
406
407-bool t_request::is_valid(bool &fatal, string &reason) const {
408+bool t_request::is_valid(bool &fatal, std::string &reason) const {
409 if (!t_sip_message::is_valid(fatal, reason)) return false;
410
411 fatal = false;
412@@ -702,8 +695,8 @@ void t_request::set_destination(const t_
413 }
414
415 bool t_request::www_authorize(const t_challenge &chlg, t_user *user_config,
416- const string &username, const string &passwd, unsigned long nc,
417- const string &cnonce, t_credentials &cr, string &fail_reason)
418+ const std::string &username, const std::string &passwd, unsigned long nc,
419+ const std::string &cnonce, t_credentials &cr, std::string &fail_reason)
420 {
421 if (!authorize(chlg, user_config, username, passwd, nc, cnonce, cr, fail_reason)) {
422 return false;
423@@ -715,8 +708,8 @@ bool t_request::www_authorize(const t_ch
424 }
425
426 bool t_request::proxy_authorize(const t_challenge &chlg, t_user *user_config,
427- const string &username, const string &passwd, unsigned long nc,
428- const string &cnonce, t_credentials &cr, string &fail_reason)
429+ const std::string &username, const std::string &passwd, unsigned long nc,
430+ const std::string &cnonce, t_credentials &cr, std::string &fail_reason)
431 {
432 if (!authorize(chlg, user_config, username, passwd, nc, cnonce, cr, fail_reason)) {
433 return false;
434Index: twinkle-1.4.2/src/parser/sip_body.h
435===================================================================
436--- twinkle-1.4.2.orig/src/parser/sip_body.h 2009-01-03 17:54:00.000000000 +0100
437+++ twinkle-1.4.2/src/parser/sip_body.h 2011-09-27 12:33:39.794913123 +0200
438@@ -20,7 +20,7 @@
439 #ifndef _H_SIP_BODY
440 #define _H_SIP_BODY
441
442-#include <cc++/config.h>
443+#include <commoncpp/config.h>
444 #include <string>
445 #include <libxml/tree.h>
446
447Index: twinkle-1.4.2/src/presence/presence_dialog.cpp
448===================================================================
449--- twinkle-1.4.2.orig/src/presence/presence_dialog.cpp 2009-01-03 17:54:07.000000000 +0100
450+++ twinkle-1.4.2/src/presence/presence_dialog.cpp 2011-09-27 12:33:39.849913648 +0200
451@@ -32,4 +32,5 @@ t_presence_dialog::t_presence_dialog(t_p
452 t_presence_dialog *t_presence_dialog::copy(void) {
453 // Copy is not needed.
454 assert(false);
455+ return NULL;
456 }
457Index: twinkle-1.4.2/src/sdp/sdp.cpp
458===================================================================
459--- twinkle-1.4.2.orig/src/sdp/sdp.cpp 2009-01-03 17:54:03.000000000 +0100
460+++ twinkle-1.4.2/src/sdp/sdp.cpp 2011-09-27 12:33:39.850913659 +0200
461@@ -37,6 +37,7 @@ string sdp_ntwk_type2str(t_sdp_ntwk_type
462 default:
463 assert(false);
464 }
465+ return "";
466 }
467
468 t_sdp_ntwk_type str2sdp_ntwk_type(string s) {
469@@ -53,6 +54,7 @@ string sdp_addr_type2str(t_sdp_addr_type
470 default:
471 assert(false);
472 }
473+ return "";
474 }
475
476 t_sdp_addr_type str2sdp_addr_type(string s) {
477@@ -69,6 +71,7 @@ string sdp_transport2str(t_sdp_transport
478 default:
479 assert(false);
480 }
481+ return "";
482 }
483
484 t_sdp_transport str2sdp_transport(string s) {
485@@ -92,6 +95,7 @@ string sdp_media_type2str(t_sdp_media_ty
486 default:
487 assert(false);
488 }
489+ return "";
490 }
491
492 string get_rtpmap(unsigned format, t_audio_codec codec) {
493@@ -153,6 +157,7 @@ string sdp_media_direction2str(t_sdp_med
494 default:
495 assert(false);
496 }
497+ return "";
498 }
499
500 ///////////////////////////////////
501Index: twinkle-1.4.2/src/sequence_number.h
502===================================================================
503--- twinkle-1.4.2.orig/src/sequence_number.h 2009-01-03 17:53:58.000000000 +0100
504+++ twinkle-1.4.2/src/sequence_number.h 2011-09-27 12:33:39.850913659 +0200
505@@ -24,7 +24,6 @@
506 #ifndef _SEQUENCE_NUMBER_H
507 #define _SEQUENCE_NUMBER_H
508
509-#include <cc++/config.h>
510
511 /**
512 * Sequence numbers.
513Index: twinkle-1.4.2/src/sys_settings.cpp
514===================================================================
515--- twinkle-1.4.2.orig/src/sys_settings.cpp 2009-02-11 22:46:13.000000000 +0100
516+++ twinkle-1.4.2/src/sys_settings.cpp 2011-09-27 12:33:39.851913671 +0200
517@@ -1064,7 +1064,7 @@ string t_sys_settings::about(bool html)
518 if (html) s += "<BR>";
519 s += "\n";
520
521- s += "* GNU CommonC++ - http://www.gnu.org/software/commoncpp";
522+ s += "* GNU uCommon C++ - http://www.gnutelephony.org/index.php/Category:Software";
523 if (html) s += "<BR><BR>";
524 s += "\n\n";
525
526Index: twinkle-1.4.2/src/timekeeper.cpp
527===================================================================
528--- twinkle-1.4.2.orig/src/timekeeper.cpp 2009-01-18 15:45:26.000000000 +0100
529+++ twinkle-1.4.2/src/timekeeper.cpp 2011-09-27 12:33:39.851913671 +0200
530@@ -782,4 +782,5 @@ void *timekeeper_sigwait(void *arg) {
531 if (sigwait(&sigset, &sig) == EINTR) continue;
532 evq_timekeeper->interrupt();
533 }
534+ return NULL;
535 }
536Index: twinkle-1.4.2/src/user.cpp
537===================================================================
538--- twinkle-1.4.2.orig/src/user.cpp 2009-02-24 21:33:16.000000000 +0100
539+++ twinkle-1.4.2/src/user.cpp 2011-09-27 12:33:39.852913682 +0200
540@@ -225,6 +225,7 @@ string t_user::bit_rate_type2str(t_bit_r
541 default:
542 assert(false);
543 }
544+ return "";
545 }
546
547 t_dtmf_transport t_user::str2dtmf_transport(const string &s) const {
548@@ -244,6 +245,7 @@ string t_user::dtmf_transport2str(t_dtmf
549 default:
550 assert(false);
551 }
552+ return "";
553 }
554
555 t_g726_packing t_user::str2g726_packing(const string &s) const {
556@@ -259,6 +261,7 @@ string t_user::g726_packing2str(t_g726_p
557 default:
558 assert(false);
559 }
560+ return "";
561 }
562
563 t_sip_transport t_user::str2sip_transport(const string &s) const {
564@@ -276,6 +279,7 @@ string t_user::sip_transport2str(t_sip_t
565 default:
566 assert(false);
567 }
568+ return "";
569 }
570
571 string t_user::expand_filename(const string &filename) {
572Index: twinkle-1.4.2/src/user.h
573===================================================================
574--- twinkle-1.4.2.orig/src/user.h 2009-02-18 22:14:52.000000000 +0100
575+++ twinkle-1.4.2/src/user.h 2011-09-27 12:33:39.853913692 +0200
576@@ -25,7 +25,6 @@
577
578 #include <string>
579 #include <list>
580-#include <cc++/config.h>
581 #include "protocol.h"
582 #include "sys_settings.h"
583 #include "audio/audio_codecs.h"
584Index: twinkle-1.4.2/src/util.h
585===================================================================
586--- twinkle-1.4.2.orig/src/util.h 2009-01-18 16:01:53.000000000 +0100
587+++ twinkle-1.4.2/src/util.h 2011-09-27 12:33:39.853913692 +0200
588@@ -26,7 +26,7 @@
589
590 #include <vector>
591 #include <string>
592-#include <cc++/config.h>
593+#include <commoncpp/config.h>
594
595 using namespace std;
596
597Index: twinkle-1.4.2/src/gui/twinkle.pro
598===================================================================
599--- twinkle-1.4.2.orig/src/gui/twinkle.pro 2009-02-25 21:14:55.000000000 +0100
600+++ twinkle-1.4.2/src/gui/twinkle.pro 2011-09-27 12:33:51.309024215 +0200
601@@ -3,7 +3,7 @@ LANGUAGE = C++
602
603 CONFIG += qt warn_on release thread
604
605-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline
606+LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline -lkio
607
608 DEFINES += QT_NO_STL
609
twinkle - SIP Soft Phone
This page took 0.120368 seconds and 4 git commands to generate.