j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

port_t isn't used anymore and conflicts with MacOS/X headers.

Browse source
This commit is contained in:
Guus Sliepen 2002-09-15 12:26:24 +00:00
parent 38c80bdd46
commit 8d472a415e
3 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/conf.c
View file

@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: conf.c,v 1.9.4.60 2002/09/09 22:32:30 guus Exp $ $Id: conf.c,v 1.9.4.61 2002/09/15 12:26:24 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -228,24 +228,6 @@ int get_config_address(config_t *cfg, struct addrinfo **result)
return 0; return 0;
} }
int get_config_port(config_t *cfg, port_t *result)
{
cp();
if(!cfg)
return 0;
if(sscanf(cfg->value, "%hu", result) == 1) {
*result = htons(*result);
return 1;
}
syslog(LOG_ERR, _("Port number expected for configuration variable %s in %s line %d"),
cfg->variable, cfg->file, cfg->line);
return 0;
}
int get_config_subnet(config_t *cfg, subnet_t ** result) int get_config_subnet(config_t *cfg, subnet_t ** result)
{ {
subnet_t *subnet; subnet_t *subnet;

3
src/conf.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: conf.h,v 1.6.4.34 2002/09/09 21:24:31 guus Exp $ $Id: conf.h,v 1.6.4.35 2002/09/15 12:26:24 guus Exp $
*/ */
#ifndef __TINC_CONF_H__ #ifndef __TINC_CONF_H__
@ -56,7 +56,6 @@ extern config_t *lookup_config(avl_tree_t *, char *);
extern config_t *lookup_config_next(avl_tree_t *, config_t *); extern config_t *lookup_config_next(avl_tree_t *, config_t *);
extern int get_config_bool(config_t *, int *); extern int get_config_bool(config_t *, int *);
extern int get_config_int(config_t *, int *); extern int get_config_int(config_t *, int *);
extern int get_config_port(config_t *, port_t *);
extern int get_config_string(config_t *, char **); extern int get_config_string(config_t *, char **);
extern int get_config_address(config_t *, struct addrinfo **); extern int get_config_address(config_t *, struct addrinfo **);
struct subnet_t; /* Needed for next line. */ struct subnet_t; /* Needed for next line. */

4
src/net.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.54 2002/09/10 22:12:33 guus Exp $ $Id: net.h,v 1.9.4.55 2002/09/15 12:26:24 guus Exp $
*/ */
#ifndef __TINC_NET_H__ #ifndef __TINC_NET_H__
@ -65,8 +65,6 @@ typedef struct ipv6_t {
uint16_t x[8]; uint16_t x[8];
} ipv6_t; } ipv6_t;
typedef unsigned short port_t;
typedef short length_t; typedef short length_t;
typedef union { typedef union {