Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
c6c0018a
Commit
c6c0018a
authored
10 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
sipaccountbase: fix build for --disable-video
Refs #53127 Change-Id: Id30c350618d7658f04014d255af92a580b85fd5c
parent
e5e031ca
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/sip/sipaccountbase.cpp
+0
-2
0 additions, 2 deletions
daemon/src/sip/sipaccountbase.cpp
daemon/src/sip/sipaccountbase.h
+0
-4
0 additions, 4 deletions
daemon/src/sip/sipaccountbase.h
with
0 additions
and
6 deletions
daemon/src/sip/sipaccountbase.cpp
+
0
−
2
View file @
c6c0018a
...
@@ -161,9 +161,7 @@ void SIPAccountBase::unserialize(const YAML::Node &node)
...
@@ -161,9 +161,7 @@ void SIPAccountBase::unserialize(const YAML::Node &node)
parseValue
(
srtpMap
,
RTP_FALLBACK_KEY
,
srtpFallback_
);
parseValue
(
srtpMap
,
RTP_FALLBACK_KEY
,
srtpFallback_
);
unserializeRange
(
node
,
AUDIO_PORT_MIN_KEY
,
AUDIO_PORT_MAX_KEY
,
audioPortRange_
);
unserializeRange
(
node
,
AUDIO_PORT_MIN_KEY
,
AUDIO_PORT_MAX_KEY
,
audioPortRange_
);
#ifdef SFL_VIDEO
unserializeRange
(
node
,
VIDEO_PORT_MIN_KEY
,
VIDEO_PORT_MAX_KEY
,
videoPortRange_
);
unserializeRange
(
node
,
VIDEO_PORT_MIN_KEY
,
VIDEO_PORT_MAX_KEY
,
videoPortRange_
);
#endif
}
}
...
...
This diff is collapsed.
Click to expand it.
daemon/src/sip/sipaccountbase.h
+
0
−
4
View file @
c6c0018a
...
@@ -101,10 +101,8 @@ namespace Conf {
...
@@ -101,10 +101,8 @@ namespace Conf {
const
char
*
const
CRED_KEY
=
"credential"
;
const
char
*
const
CRED_KEY
=
"credential"
;
const
char
*
const
AUDIO_PORT_MIN_KEY
=
"audioPortMin"
;
const
char
*
const
AUDIO_PORT_MIN_KEY
=
"audioPortMin"
;
const
char
*
const
AUDIO_PORT_MAX_KEY
=
"audioPortMax"
;
const
char
*
const
AUDIO_PORT_MAX_KEY
=
"audioPortMax"
;
#ifdef SFL_VIDEO
const
char
*
const
VIDEO_PORT_MIN_KEY
=
"videoPortMin"
;
const
char
*
const
VIDEO_PORT_MIN_KEY
=
"videoPortMin"
;
const
char
*
const
VIDEO_PORT_MAX_KEY
=
"videoPortMax"
;
const
char
*
const
VIDEO_PORT_MAX_KEY
=
"videoPortMax"
;
#endif
}
}
class
SIPVoIPLink
;
class
SIPVoIPLink
;
...
@@ -385,12 +383,10 @@ protected:
...
@@ -385,12 +383,10 @@ protected:
*/
*/
std
::
pair
<
uint16_t
,
uint16_t
>
audioPortRange_
{
16384
,
32766
};
std
::
pair
<
uint16_t
,
uint16_t
>
audioPortRange_
{
16384
,
32766
};
#ifdef SFL_VIDEO
/**
/**
* Port range for video RTP ports
* Port range for video RTP ports
*/
*/
std
::
pair
<
uint16_t
,
uint16_t
>
videoPortRange_
{
49152
,
(
MAX_PORT
)
-
2
};
std
::
pair
<
uint16_t
,
uint16_t
>
videoPortRange_
{
49152
,
(
MAX_PORT
)
-
2
};
#endif
static
bool
portsInUse_
[
HALF_MAX_PORT
];
static
bool
portsInUse_
[
HALF_MAX_PORT
];
static
uint16_t
getRandomEvenNumber
(
const
std
::
pair
<
uint16_t
,
uint16_t
>
&
range
);
static
uint16_t
getRandomEvenNumber
(
const
std
::
pair
<
uint16_t
,
uint16_t
>
&
range
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment