Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
45f7396c
Commit
45f7396c
authored
Jan 25, 2017
by
louiz’
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cancel the IRC server linger timer when we try to-rejoin a channel on it
parent
b660a473
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
src/bridge/bridge.cpp
src/bridge/bridge.cpp
+7
-0
src/bridge/bridge.hpp
src/bridge/bridge.hpp
+1
-0
No files found.
src/bridge/bridge.cpp
View file @
45f7396c
...
...
@@ -169,6 +169,7 @@ bool Bridge::join_irc_channel(const Iid& iid, const std::string& nickname, const
const
std
::
string
&
resource
)
{
const
auto
hostname
=
iid
.
get_server
();
this
->
cancel_linger_timer
(
hostname
);
IrcClient
*
irc
=
this
->
make_irc_client
(
hostname
,
nickname
);
this
->
add_resource_to_server
(
hostname
,
resource
);
auto
res_in_chan
=
this
->
is_resource_in_chan
(
ChannelKey
{
iid
.
get_local
(),
hostname
},
resource
);
...
...
@@ -1232,3 +1233,9 @@ void Bridge::quit_or_start_linger_timer(const std::string& irc_hostname)
},
event_name
);
TimedEventsManager
::
instance
().
add_event
(
std
::
move
(
event
));
}
void
Bridge
::
cancel_linger_timer
(
const
std
::
string
&
irc_hostname
)
{
const
auto
event_name
=
"IRCLINGER:"
+
irc_hostname
+
".."
+
this
->
get_bare_jid
();
TimedEventsManager
::
instance
().
cancel
(
event_name
);
}
src/bridge/bridge.hpp
View file @
45f7396c
...
...
@@ -241,6 +241,7 @@ public:
* configured linger time is expired.
*/
void
quit_or_start_linger_timer
(
const
std
::
string
&
irc_hostname
);
void
cancel_linger_timer
(
const
std
::
string
&
irc_hostname
);
private:
/**
...
...
louiz’
@louiz
mentioned in commit
e3ee824e
·
Apr 20, 2017
mentioned in commit
e3ee824e
mentioned in commit e3ee824e5c5548c13605e4f2e2ded9491c1c1479
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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