#include <types.h>
#include <utils/linked_list.h>
-#include <utils/host.h>
+#include <network/host.h>
#include <encoding/payloads/transform_substructure.h>
#include <transforms/prfs/prf.h>
#include <transforms/signers/signer.h>
OBJS+= $(BUILD_DIR)packet.o
$(BUILD_DIR)packet.o : $(NETWORK_DIR)packet.c $(NETWORK_DIR)packet.h
$(CC) $(CFLAGS) -c -o $@ $<
-
+
OBJS+= $(BUILD_DIR)socket.o
$(BUILD_DIR)socket.o : $(NETWORK_DIR)socket.c $(NETWORK_DIR)socket.h
- $(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
+ $(CC) $(CFLAGS) -c -o $@ $<
+
+OBJS+= $(BUILD_DIR)host.o
+$(BUILD_DIR)host.o : $(NETWORK_DIR)host.c $(NETWORK_DIR)host.h
+ $(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
--- /dev/null
+/**
+ * @file host.c
+ *
+ * @brief host object, identifies a host and defines some useful functions on it.
+ *
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program 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 General Public License
+ * for more details.
+ */
+
+#include "host.h"
+
+#include <utils/allocator.h>
+
+/**
+ * @brief The logger object.
+ */
+typedef struct private_host_s private_host_t;
+struct private_host_s {
+ /**
+ * Public data
+ */
+ host_t public;
+
+ /**
+ * Address family to use, such as AF_INET or AF_INET6
+ */
+ int family;
+
+ /**
+ * low-lewel structure, wich stores the address
+ */
+ sockaddr_t address;
+
+ /**
+ * length of address structure
+ */
+ socklen_t socklen;
+};
+
+
+/**
+ * implements host_t.get_sockaddr
+ */
+static sockaddr_t *get_sockaddr(private_host_t *this)
+{
+ return &(this->address);
+}
+
+/**
+ * implements host_t.get_sockaddr_len
+ */
+static socklen_t *get_sockaddr_len(private_host_t *this)
+{
+ return &(this->socklen);
+}
+
+/**
+ * implements host_t.get_address
+ */
+static char *get_address(private_host_t *this)
+{
+ switch (this->family)
+ {
+ case AF_INET:
+ {
+ struct sockaddr_in *sin = (struct sockaddr_in*)&(this->address);
+ return inet_ntoa(sin->sin_addr);
+ }
+ default:
+ {
+ return "(family not supported)";
+ }
+ }
+}
+
+/**
+ * implements host_t.get_port
+ */
+static u_int16_t get_port(private_host_t *this)
+{
+ switch (this->family)
+ {
+ case AF_INET:
+ {
+ struct sockaddr_in *sin = (struct sockaddr_in*)&(this->address);
+ return ntohs(sin->sin_port);
+ }
+ default:
+ {
+ return 0;
+ }
+ }
+}
+
+/**
+ * Implements host_t.destroy
+ */
+static status_t destroy(private_host_t *this)
+{
+ allocator_free(this);
+ return SUCCESS;
+}
+
+/**
+ * Implements host_t.clone.
+ */
+static status_t clone(private_host_t *this, host_t **other)
+{
+ private_host_t *new = allocator_alloc_thing(private_host_t);
+
+ if (new == NULL)
+ {
+ return OUT_OF_RES;
+ }
+
+ memcpy(new, this, sizeof(private_host_t));
+ *other = (host_t*)new;
+
+ return SUCCESS;
+}
+
+
+/*
+ * see header
+ */
+host_t *host_create(int family, char *address, u_int16_t port)
+{
+ private_host_t *this = allocator_alloc_thing(private_host_t);
+ if (this == NULL)
+ {
+ return NULL;
+ }
+
+ this->public.get_sockaddr = (sockaddr_t* (*) (host_t*))get_sockaddr;
+ this->public.get_sockaddr_len = (socklen_t*(*) (host_t*))get_sockaddr_len;
+ this->public.clone = (status_t (*) (host_t*, host_t**))clone;
+ this->public.get_address = (char* (*) (host_t *))get_address;
+ this->public.get_port = (u_int16_t (*) (host_t *))get_port;
+ this->public.destroy = (status_t (*) (host_t*))destroy;
+
+ this->family = family;
+
+ switch (family)
+ {
+ /* IPv4 */
+ case AF_INET:
+ {
+ struct sockaddr_in *sin = (struct sockaddr_in*)&(this->address);
+ sin->sin_family = AF_INET;
+ sin->sin_addr.s_addr = inet_addr(address);
+ sin->sin_port = htons(port);
+ this->socklen = sizeof(struct sockaddr_in);
+ return (host_t*)this;
+ }
+ }
+ allocator_free(this);
+ return NULL;
+}
--- /dev/null
+/**
+ * @file host.h
+ *
+ * @brief host object, identifies a host and defines some useful functions on it.
+ *
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program 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 General Public License
+ * for more details.
+ */
+
+#ifndef HOST_H_
+#define HOST_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <types.h>
+
+/**
+ * @brief The logger object
+ */
+typedef struct host_s host_t;
+struct host_s {
+ /**
+ * @brief Build a clone of this host object.
+ *
+ * @param this object to clone
+ * @param [out]other address where to allocate the clone
+ * @return
+ * - SUCCESS, or
+ * - OUT_OF_RES
+ */
+
+ status_t (*clone) (host_t *this, host_t **other);
+ /**
+ * @brief Get a pointer to the internal sockaddr struct.
+ *
+ * This is used for sending and receiving via sockets.
+ *
+ * @param this object to clone
+ * @return pointer to the internal sockaddr structure
+ */
+ sockaddr_t *(*get_sockaddr) (host_t *this);
+
+ /**
+ * @brief Get the length of the sockaddr struct.
+ *
+ * Sepending on the family, the length of the sockaddr struct
+ * is different. Use this function to get the length of the sockaddr
+ * struct returned by get_sock_addr.
+ *
+ * This is used for sending and receiving via sockets.
+ *
+ * @param this object to clone
+ * @return length of the sockaddr struct
+ */
+ socklen_t *(*get_sockaddr_len) (host_t *this);
+
+ /**
+ * @brief get the address of this host
+ *
+ * Mostly used for debugging purposes.
+ * @warging string must NOT be freed
+ *
+ * @param this object to clone
+ * @return address string,
+ */
+ char* (*get_address) (host_t *this);
+
+ /**
+ * @brief get the port of this host
+ *
+ * Mostly used for debugging purposes.
+ *
+ * @param this object to clone
+ * @return port number
+ */
+ u_int16_t (*get_port) (host_t *this);
+
+ /**
+ * @brief Destroy this host object
+ *
+ * @param this calling
+ * @return SUCCESS in any case
+ */
+ status_t (*destroy) (host_t *this);
+};
+
+/**
+ * @brief Constructor to create a host_t object
+ *
+ * currently supports only IPv4!
+ *
+ * @param family Address family to use for this object, such as AF_INET or AF_INET6
+ * @param address string of an address, such as "152.96.193.130"
+ * @param port port number
+ * @return the host_t object or NULL, when
+ * not enough ressources, or
+ * family not supported.
+ */
+host_t *host_create(int family, char *address, u_int16_t port);
+
+
+#endif /*HOST_H_*/
#include <types.h>
-#include <utils/host.h>
+#include <network/host.h>
$(BUILD_DIR)gmp_helper.o : $(UTILS_DIR)gmp_helper.c $(UTILS_DIR)gmp_helper.h
$(CC) $(CFLAGS) -c -o $@ $<
-OBJS+= $(BUILD_DIR)host.o
-$(BUILD_DIR)host.o : $(UTILS_DIR)host.c $(UTILS_DIR)host.h
- $(CC) $(CFLAGS) -c -o $@ $<
-
OBJS+= $(BUILD_DIR)linked_list.o
$(BUILD_DIR)linked_list.o : $(UTILS_DIR)linked_list.c $(UTILS_DIR)linked_list.h
$(CC) $(CFLAGS) -c -o $@ $<
+++ /dev/null
-/**
- * @file host.c
- *
- * @brief host object, identifies a host and defines some useful functions on it.
- *
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program 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 General Public License
- * for more details.
- */
-
-#include "host.h"
-
-#include <utils/allocator.h>
-
-/**
- * @brief The logger object.
- */
-typedef struct private_host_s private_host_t;
-struct private_host_s {
- /**
- * Public data
- */
- host_t public;
-
- /**
- * Address family to use, such as AF_INET or AF_INET6
- */
- int family;
-
- /**
- * low-lewel structure, wich stores the address
- */
- sockaddr_t address;
-
- /**
- * length of address structure
- */
- socklen_t socklen;
-};
-
-
-/**
- * implements host_t.get_sockaddr
- */
-static sockaddr_t *get_sockaddr(private_host_t *this)
-{
- return &(this->address);
-}
-
-/**
- * implements host_t.get_sockaddr_len
- */
-static socklen_t *get_sockaddr_len(private_host_t *this)
-{
- return &(this->socklen);
-}
-
-/**
- * implements host_t.get_address
- */
-static char *get_address(private_host_t *this)
-{
- switch (this->family)
- {
- case AF_INET:
- {
- struct sockaddr_in *sin = (struct sockaddr_in*)&(this->address);
- return inet_ntoa(sin->sin_addr);
- }
- default:
- {
- return "(family not supported)";
- }
- }
-}
-
-/**
- * implements host_t.get_port
- */
-static u_int16_t get_port(private_host_t *this)
-{
- switch (this->family)
- {
- case AF_INET:
- {
- struct sockaddr_in *sin = (struct sockaddr_in*)&(this->address);
- return ntohs(sin->sin_port);
- }
- default:
- {
- return 0;
- }
- }
-}
-
-/**
- * Implements host_t.destroy
- */
-static status_t destroy(private_host_t *this)
-{
- allocator_free(this);
- return SUCCESS;
-}
-
-/**
- * Implements host_t.clone.
- */
-static status_t clone(private_host_t *this, host_t **other)
-{
- private_host_t *new = allocator_alloc_thing(private_host_t);
-
- if (new == NULL)
- {
- return OUT_OF_RES;
- }
-
- memcpy(new, this, sizeof(private_host_t));
- *other = (host_t*)new;
-
- return SUCCESS;
-}
-
-
-/*
- * see header
- */
-host_t *host_create(int family, char *address, u_int16_t port)
-{
- private_host_t *this = allocator_alloc_thing(private_host_t);
- if (this == NULL)
- {
- return NULL;
- }
-
- this->public.get_sockaddr = (sockaddr_t* (*) (host_t*))get_sockaddr;
- this->public.get_sockaddr_len = (socklen_t*(*) (host_t*))get_sockaddr_len;
- this->public.clone = (status_t (*) (host_t*, host_t**))clone;
- this->public.get_address = (char* (*) (host_t *))get_address;
- this->public.get_port = (u_int16_t (*) (host_t *))get_port;
- this->public.destroy = (status_t (*) (host_t*))destroy;
-
- this->family = family;
-
- switch (family)
- {
- /* IPv4 */
- case AF_INET:
- {
- struct sockaddr_in *sin = (struct sockaddr_in*)&(this->address);
- sin->sin_family = AF_INET;
- sin->sin_addr.s_addr = inet_addr(address);
- sin->sin_port = htons(port);
- this->socklen = sizeof(struct sockaddr_in);
- return (host_t*)this;
- }
- }
- allocator_free(this);
- return NULL;
-}
+++ /dev/null
-/**
- * @file host.h
- *
- * @brief host object, identifies a host and defines some useful functions on it.
- *
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program 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 General Public License
- * for more details.
- */
-
-#ifndef HOST_H_
-#define HOST_H_
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <types.h>
-
-/**
- * @brief The logger object
- */
-typedef struct host_s host_t;
-struct host_s {
- /**
- * @brief Build a clone of this host object.
- *
- * @param this object to clone
- * @param [out]other address where to allocate the clone
- * @return
- * - SUCCESS, or
- * - OUT_OF_RES
- */
-
- status_t (*clone) (host_t *this, host_t **other);
- /**
- * @brief Get a pointer to the internal sockaddr struct.
- *
- * This is used for sending and receiving via sockets.
- *
- * @param this object to clone
- * @return pointer to the internal sockaddr structure
- */
- sockaddr_t *(*get_sockaddr) (host_t *this);
-
- /**
- * @brief Get the length of the sockaddr struct.
- *
- * Sepending on the family, the length of the sockaddr struct
- * is different. Use this function to get the length of the sockaddr
- * struct returned by get_sock_addr.
- *
- * This is used for sending and receiving via sockets.
- *
- * @param this object to clone
- * @return length of the sockaddr struct
- */
- socklen_t *(*get_sockaddr_len) (host_t *this);
-
- /**
- * @brief get the address of this host
- *
- * Mostly used for debugging purposes.
- * @warging string must NOT be freed
- *
- * @param this object to clone
- * @return address string,
- */
- char* (*get_address) (host_t *this);
-
- /**
- * @brief get the port of this host
- *
- * Mostly used for debugging purposes.
- *
- * @param this object to clone
- * @return port number
- */
- u_int16_t (*get_port) (host_t *this);
-
- /**
- * @brief Destroy this host object
- *
- * @param this calling
- * @return SUCCESS in any case
- */
- status_t (*destroy) (host_t *this);
-};
-
-/**
- * @brief Constructor to create a host_t object
- *
- * currently supports only IPv4!
- *
- * @param family Address family to use for this object, such as AF_INET or AF_INET6
- * @param address string of an address, such as "152.96.193.130"
- * @param port port number
- * @return the host_t object or NULL, when
- * not enough ressources, or
- * family not supported.
- */
-host_t *host_create(int family, char *address, u_int16_t port);
-
-
-#endif /*HOST_H_*/
projects / strongswan.git / commitdiff