Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
192cfb66
Commit
192cfb66
authored
Oct 11, 2011
by
Tristan Matthews
Browse files
* #7133: renamed SdesNegotiator and Pattern to lowercase names
parent
d1294de5
Changes
11
Hide whitespace changes
Inline
Side-by-side
daemon/src/audio/audiortp/audio_rtp_factory.cpp
View file @
192cfb66
...
...
@@ -38,7 +38,7 @@
#include
"sip/sdp.h"
#include
"sip/sipcall.h"
#include
"sip/sipaccount.h"
#include
"sip/
S
des
N
egotiator.h"
#include
"sip/
s
des
_n
egotiator.h"
namespace
sfl
{
...
...
daemon/src/audio/audiortp/audio_rtp_factory.h
View file @
192cfb66
...
...
@@ -36,7 +36,7 @@
#include
<ccrtp/CryptoContext.h>
#include
"audio_rtp_session.h"
#include
"sip/
S
des
N
egotiator.h"
#include
"sip/
s
des
_n
egotiator.h"
class
SdesNegotiator
;
class
SIPCall
;
...
...
daemon/src/audio/audiortp/audio_srtp_session.h
View file @
192cfb66
...
...
@@ -32,7 +32,7 @@
#include
"audio_rtp_session.h"
#include
"audio_symmetric_rtp_session.h"
#include
"sip/
S
des
N
egotiator.h"
#include
"sip/
s
des
_n
egotiator.h"
#include
<ccrtp/CryptoContext.h>
#include
<vector>
...
...
daemon/src/sip/Makefile.am
View file @
192cfb66
...
...
@@ -3,16 +3,14 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES
=
libsiplink.la
libsiplink_la_SOURCES
=
\
P
attern.cpp
\
S
des
N
egotiator.cpp
\
p
attern.cpp
\
s
des
_n
egotiator.cpp
\
sdp.cpp
\
sipaccount.cpp
\
sipcall.cpp
\
sipvoiplink.cpp
noinst_HEADERS
=
\
Pattern.h
\
SdesNegotiator.h
\
sipvoiplink.cpp
\
pattern.h
\
sdes_negotiator.h
\
sdp.h
\
sipaccount.h
\
sipcall.h
\
...
...
daemon/src/sip/
P
attern.cpp
→
daemon/src/sip/
p
attern.cpp
View file @
192cfb66
...
...
@@ -27,7 +27,7 @@
* as that of the covered work.
*/
#include
"
P
attern.h"
#include
"
p
attern.h"
#include
<sstream>
#include
<cstdio>
...
...
daemon/src/sip/
P
attern.h
→
daemon/src/sip/
p
attern.h
View file @
192cfb66
...
...
@@ -26,8 +26,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef __
SFL_
PATTERN_H__
#define __
SFL_
PATTERN_H__
#ifndef __PATTERN_H__
#define __PATTERN_H__
#include
<stdexcept>
#include
<string>
...
...
@@ -345,4 +345,4 @@ class Pattern {
}
#endif
#endif
// __PATTERN_H__ // __PATTERN_H__ // __PATTERN_H__ // __PATTERN_H__
daemon/src/sip/
S
des
N
egotiator.cpp
→
daemon/src/sip/
s
des
_n
egotiator.cpp
View file @
192cfb66
...
...
@@ -28,9 +28,8 @@
* as that of the covered work.
*/
#include
"SdesNegotiator.h"
#include
"Pattern.h"
#include
"sdes_negotiator.h"
#include
"pattern.h"
#include
<cstdio>
#include
<iostream>
...
...
daemon/src/sip/
S
des
N
egotiator.h
→
daemon/src/sip/
s
des
_n
egotiator.h
View file @
192cfb66
...
...
@@ -27,8 +27,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef __
SFL_
SDES_NEGOTIATOR_H__
#define __
SFL_
SDES_NEGOTIATOR_H__
#ifndef __SDES_NEGOTIATOR_H__
#define __SDES_NEGOTIATOR_H__
#include
<stdexcept>
#include
<string>
...
...
@@ -254,4 +254,4 @@ class SdesNegotiator {
std
::
vector
<
CryptoAttribute
*>
parse
(
void
);
};
}
#endif
#endif
// __SDES_NEGOTIATOR_H__
daemon/src/sip/sipvoiplink.cpp
View file @
192cfb66
...
...
@@ -44,7 +44,7 @@
#include
"sipcall.h"
#include
"sipaccount.h"
#include
"eventthread.h"
#include
"
S
des
N
egotiator.h"
#include
"
s
des
_n
egotiator.h"
#include
"dbus/dbusmanager.h"
#include
"dbus/callmanager.h"
...
...
daemon/test/sdesnegotiatortest.cpp
View file @
192cfb66
...
...
@@ -41,6 +41,8 @@
#include
<sstream>
#include
"sdesnegotiatortest.h"
#include
"sip/pattern.h"
#include
"sip/sdes_negotiator.h"
#include
<unistd.h>
#include
"global.h"
...
...
daemon/test/sdesnegotiatortest.h
View file @
192cfb66
...
...
@@ -34,8 +34,6 @@
#include
<cppunit/TestCase.h>
#include
<cppunit/TestSuite.h>
#include
<assert.h>
#include
<cstddef>
#include
<stdio.h>
#include
<sstream>
...
...
@@ -50,20 +48,19 @@
#include
<pjlib-util.h>
#include
<pjnath/stun_config.h>
// Application import
#include
"sip/SdesNegotiator.h"
#include
"sip/Pattern.h"
/*
* @file sdesnegotiationTest.cpp
* @brief Regroups unitary tests related to the plugin manager.
*/
#ifndef _SDESNEGOTIATOR_TEST_
#define _SDESNEGOTIATOR_TEST_
#ifndef
_
_SDESNEGOTIATOR_TEST_
H__
#define
_
_SDESNEGOTIATOR_TEST_
H__
#include
"sip/sdes_negotiator.h"
// for CryptoSuiteDefinition
namespace
sfl
{
class
Pattern
;
}
class
SdesNegotiatorTest
:
public
CppUnit
::
TestCase
{
...
...
@@ -119,4 +116,4 @@ class SdesNegotiatorTest : public CppUnit::TestCase {
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION
(
SdesNegotiatorTest
,
"SdesNegotiatorTest"
);
CPPUNIT_TEST_SUITE_REGISTRATION
(
SdesNegotiatorTest
);
#endif
#endif
// __SDESNEGOTIATOR_TEST_H__
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment