Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
b5562b3c
Commit
b5562b3c
authored
Dec 17, 2008
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove useless agent in socks5 proxy, fix copyright and return FALSE in send, if we're in an error
parent
6efd9ab5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
17 deletions
+13
-17
agent/agent.c
agent/agent.c
+1
-1
socket/socks5.c
socket/socks5.c
+7
-10
socket/socks5.h
socket/socks5.h
+5
-6
No files found.
agent/agent.c
View file @
b5562b3c
...
...
@@ -920,7 +920,7 @@ priv_add_new_candidate_discovery_turn (NiceAgent *agent,
if
(
socket
&&
agent
->
proxy_type
==
NICE_PROXY_TYPE_SOCKS5
)
{
socket
=
nice_socks5_socket_new
(
agent
,
socket
,
&
turn
->
server
,
socket
=
nice_socks5_socket_new
(
socket
,
&
turn
->
server
,
agent
->
proxy_username
,
agent
->
proxy_password
);
}
else
{
/* TODO add HTTP support */
...
...
socket/socks5.c
View file @
b5562b3c
/*
* This file is part of the Nice GLib ICE library.
*
* (C) 2006-2008 Collabora Ltd.
* Contact: Dafydd Harries
* Contact: Olivier Crete
* (C) 2006, 2007 Nokia Corporation. All rights reserved.
* Contact: Kai Vehmanen
* (C) 2008 Collabora Ltd.
* Contact: Youness Alaoui
* (C) 2008 Nokia Corporation. All rights reserved.
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
...
...
@@ -23,10 +21,7 @@
* Corporation. All Rights Reserved.
*
* Contributors:
* Dafydd Harries, Collabora Ltd.
* Olivier Crete, Collabora Ltd.
* Rémi Denis-Courmont, Nokia
* Kai Vehmanen
* Youness Alaoui, Collabora Ltd.
*
* Alternatively, the contents of this file may be used under the terms of the
* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
...
...
@@ -93,7 +88,7 @@ static void free_to_be_sent (struct to_be_sent *tbs);
NiceSocket
*
nice_socks5_socket_new
(
Nice
Agent
*
agent
,
Nice
Socket
*
base_socket
,
nice_socks5_socket_new
(
NiceSocket
*
base_socket
,
NiceAddress
*
addr
,
gchar
*
username
,
gchar
*
password
)
{
Socks5Priv
*
priv
;
...
...
@@ -385,6 +380,8 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
return
nice_socket_send
(
priv
->
base_socket
,
to
,
len
,
buf
);
else
return
FALSE
;
}
else
if
(
priv
->
state
==
SOCKS_STATE_ERROR
)
{
return
FALSE
;
}
else
{
add_to_be_sent
(
sock
,
to
,
buf
,
len
);
}
...
...
socket/socks5.h
View file @
b5562b3c
/*
* This file is part of the Nice GLib ICE library.
*
* (C) 2006, 2007 Collabora Ltd.
* Contact: Dafydd Harries
* (C) 2006, 2007 Nokia Corporation. All rights reserved.
* Contact: Kai Vehmanen
* (C) 2008 Collabora Ltd.
* Contact: Youness Alaoui
* (C) 2008 Nokia Corporation. All rights reserved.
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
...
...
@@ -22,7 +21,7 @@
* Corporation. All Rights Reserved.
*
* Contributors:
*
Dafydd Harries
, Collabora Ltd.
*
Youness Alaoui
, Collabora Ltd.
*
* Alternatively, the contents of this file may be used under the terms of the
* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
...
...
@@ -45,7 +44,7 @@ G_BEGIN_DECLS
NiceSocket
*
nice_socks5_socket_new
(
Nice
Agent
*
agent
,
Nice
Socket
*
base_socket
,
nice_socks5_socket_new
(
NiceSocket
*
base_socket
,
NiceAddress
*
addr
,
gchar
*
username
,
gchar
*
password
);
...
...
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