RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-05 19:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: unix: remove the now unused proto_uxst.h file

Browse Source 
Since everything is self contained in proto_uxst.c there's no need to
export anything. The same should be done for proto_tcp.c but the file
contains other stuff that's not related to the TCP protocol itself
and which should first be moved somewhere else.
This commit is contained in:
Willy Tarreau 2017-09-15 07:59:31 +02:00
parent 9d5be5c823
commit 31794892af
4 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/proto/proto_uxst.h
View File

@ -1,40 +0,0 @@
/*
* include/proto/proto_uxst.h
* This file contains UNIX-stream socket protocol definitions.
*
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, version 2.1
* exclusively.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_PROTO_UXST_H
#define _PROTO_PROTO_UXST_H
#include <common/config.h>
#include <types/stream.h>
#include <types/task.h>
int uxst_pause_listener(struct listener *l);
int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir);
int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);
#endif /* _PROTO_PROTO_UXST_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/

1
src/cli.c
View File

@ -58,7 +58,6 @@
#include <proto/pipe.h>
#include <proto/listener.h>
#include <proto/map.h>
#include <proto/proto_uxst.h>
#include <proto/proxy.h>
#include <proto/sample.h>
#include <proto/session.h>

12
src/proto_uxst.c
View File

@ -42,7 +42,6 @@
#include <proto/listener.h>
#include <proto/log.h>
#include <proto/protocol.h>
#include <proto/proto_uxst.h>
#include <proto/task.h>
static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen);
@ -50,6 +49,9 @@ static int uxst_bind_listeners(struct protocol *proto, char *errmsg, int errlen)
static int uxst_unbind_listeners(struct protocol *proto);
static int uxst_connect_server(struct connection *conn, int data, int delack);
static void uxst_add_listener(struct listener *listener, int port);
static int uxst_pause_listener(struct listener *l);
static int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir);
static int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);
/* Note: must not be declared <const> as its list will be overwritten */
static struct protocol proto_unix = {
@ -85,7 +87,7 @@ static struct protocol proto_unix = {
* success, -1 in case of error. The socket's source address is stored in
* <sa> for <salen> bytes.
*/
int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir)
static int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir)
{
if (dir)
return getsockname(fd, sa, &salen);
@ -100,7 +102,7 @@ int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir)
* case of success, -1 in case of error. The socket's source address is stored
* in <sa> for <salen> bytes.
*/
int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir)
static int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir)
{
if (dir)
return getpeername(fd, sa, &salen);
@ -386,7 +388,7 @@ static void uxst_add_listener(struct listener *listener, int port)
* plain unix sockets since currently it's the new process which handles
* the renaming. Abstract sockets are completely unbound.
*/
int uxst_pause_listener(struct listener *l)
static int uxst_pause_listener(struct listener *l)
{
if (((struct sockaddr_un *)&l->addr)->sun_path[0])
return 1;
@ -419,7 +421,7 @@ int uxst_pause_listener(struct listener *l)
* The connection's fd is inserted only when SF_ERR_NONE is returned, otherwise
* it's invalid and the caller has nothing to do.
*/
int uxst_connect_server(struct connection *conn, int data, int delack)
static int uxst_connect_server(struct connection *conn, int data, int delack)
{
int fd;
struct server *srv;

1
src/stats.c
View File

@ -58,7 +58,6 @@
#include <proto/listener.h>
#include <proto/map.h>
#include <proto/proto_http.h>
#include <proto/proto_uxst.h>
#include <proto/proxy.h>
#include <proto/sample.h>
#include <proto/session.h>