Beginning migration.

This commit is contained in:
Nicolás Ortega Froysa 2017-08-12 13:59:18 -05:00
parent e4de99086a
commit 48e9006220
No known key found for this signature in database
GPG Key ID: FEC70E3BAE2E69BF
11 changed files with 664 additions and 737 deletions

View File

@ -1,19 +1,18 @@
# Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net> # Copyright (C) 2017 Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
# Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net> # Author: Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
# #
# This program is free software: you can redistribute it and/or # This program is free software: you can redistribute it and/or modify
# modify it under the terms of the GNU Lesser General Public # it under the terms of the GNU Affero General Public License as
# License as published by the Free Software Foundation, either # published by the Free Software Foundation, either version 3 of the
# version 3 of the License, or (at your option) any later version. # License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Lesser General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Affero General Public License
# License along with this program. If not, see # along with this program. If not, see <http://www.gnu.org/licenses/>.
# <http://www.gnu.org/licenses/>.
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(NeoComm) project(NeoComm)
@ -28,26 +27,23 @@ endif()
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}") message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
option(BUILD_SHARED_LIBS option(BUILD_SHARED_LIB
"Whether to build a shared object instead of a static." OFF) "Whether to build a shared object instead of a static." OFF)
find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED)
pkg_search_module(OPENDHT REQUIRED opendht)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
include_directories( include_directories(
"include/") "include/"
SYSTEM OPENDHT_INCLUDE_DIRS)
set(SRCS #set(SRCS)
src/connectivity.c
src/error.c)
set(CMAKE_C_FLAGS "-std=c99 -Wall -Wextra -Werror -Wfatal-errors -Wmissing-declarations -pedantic-errors") set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wpedantic -Werror -Wfatal-errors -pedantic-errors -fno-elide-constructors")
set(CMAKE_C_FLAGS_DEBUG "-g -O0") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
set(CMAKE_C_FLAGS_RELEASE "-O3") set(CMAKE_CXX_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3")
set(CMAKE_C_FLAGS_MINSEZEREL "-Os") set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
if(NOT CMAKE_BUILD_TYPE MATCHES "debug" AND if(NOT CMAKE_BUILD_TYPE MATCHES "debug" AND
NOT CMAKE_BUILD_TYPE MATCHES "relwithdebinfo") NOT CMAKE_BUILD_TYPE MATCHES "relwithdebinfo")
@ -56,11 +52,13 @@ else()
add_definitions("-DDEBUG") add_definitions("-DDEBUG")
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIB)
add_library(${TARGET_NAME} SHARED ${SRCS}) add_library(${TARGET_NAME} SHARED ${SRCS})
else() else()
add_library(${TARGET_NAME} STATIC ${SRCS}) add_library(${TARGET_NAME} STATIC ${SRCS})
endif() endif()
target_link_libraries(${TARGET_NAME} if(BUILD_SHARED_LIB)
Threads::Threads) target_link_libraries(${TARGET_NAME}
${OPENDHT_LIBRARIES})
endif()

View File

@ -7,26 +7,26 @@ This is a basic contribution guide to the project. What follows are guidelines y
Licensing & Copyright Licensing & Copyright
--------------------- ---------------------
All code contributions will be licensed under the [GNU Lesser General Public License version 3 or greater](/LICENSE). If you create any new files you **must** have the following copyright notice prepended to the file: All code contributions will be licensed under the [GNU Affero General Public License version 3 or greater](/LICENSE). If you create any new files you **must** have the following copyright notice prepended to the file:
```c ```c
/* /*
* Copyright (C) 2017 <your name> <your@email.org> * Copyright (C) 2017 <your name> <your e-mail>
* Author: <your name> <your@email.org> * Author: <your email> <your e-mail>
* *
* This program is free software: you can redistribute it and/or * This program is free software: you can redistribute it and/or modify
* modify it under the terms of the GNU Lesser General Public * it under the terms of the GNU Affero General Public License as
* License as published by the Free Software Foundation, either * published by the Free Software Foundation, either version 3 of the
* version 3 of the License, or (at your option) any later version. * License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Lesser General Public License for more details. * GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
``` ```

746
LICENSE
View File

@ -1,165 +1,661 @@
GNU LESSER GENERAL PUBLIC LICENSE GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
Preamble
This version of the GNU Lesser General Public License incorporates The GNU Affero General Public License is a free, copyleft license for
the terms and conditions of version 3 of the GNU General Public software and other kinds of works, specifically designed to ensure
License, supplemented by the additional permissions listed below. cooperation with the community in the case of network server software.
0. Additional Definitions. The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
As used herein, "this License" refers to version 3 of the GNU Lesser When we speak of free software, we are referring to freedom, not
General Public License, and the "GNU GPL" refers to version 3 of the GNU price. Our General Public Licenses are designed to make sure that you
General Public License. have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
"The Library" refers to a covered work governed by this License, Developers that use our General Public Licenses protect your rights
other than an Application or a Combined Work as defined below. with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
An "Application" is any work that makes use of an interface provided A secondary benefit of defending all users' freedom is that
by the Library, but which is not otherwise based on the Library. improvements made in alternate versions of the program, if they
Defining a subclass of a class defined by the Library is deemed a mode receive widespread use, become available for other developers to
of using an interface provided by the Library. incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
A "Combined Work" is a work produced by combining or linking an The GNU Affero General Public License is designed specifically to
Application with the Library. The particular version of the Library ensure that, in such cases, the modified source code becomes available
with which the Combined Work was made is also called the "Linked to the community. It requires the operator of a network server to
Version". provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
The "Minimal Corresponding Source" for a Combined Work means the An older license, called the Affero General Public License and
Corresponding Source for the Combined Work, excluding any source code published by Affero, was designed to accomplish similar goals. This is
for portions of the Combined Work that, considered in isolation, are a different license, not a version of the Affero GPL, but Affero has
based on the Application, and not on the Linked Version. released a new version of the Affero GPL which permits relicensing under
this license.
The "Corresponding Application Code" for a Combined Work means the The precise terms and conditions for copying, distribution and
object code and/or source code for the Application, including any data modification follow.
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL. TERMS AND CONDITIONS
You may convey a covered work under sections 3 and 4 of this License 0. Definitions.
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions. "This License" refers to version 3 of the GNU Affero General Public License.
If you modify a copy of the Library, and, in your modifications, a "Copyright" also means copyright-like laws that apply to other kinds of
facility refers to a function or data to be supplied by an Application works, such as semiconductor masks.
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to "The Program" refers to any copyrightable work licensed under this
ensure that, in the event an Application does not supply the License. Each licensee is addressed as "you". "Licensees" and
function or data, the facility still operates, and performs "recipients" may be individuals or organizations.
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of To "modify" a work means to copy from or adapt all or part of the work
this License applicable to that copy. in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
3. Object Code Incorporating Material from Library Header Files. A "covered work" means either the unmodified Program or a work based
on the Program.
The object code form of an Application may incorporate material from To "propagate" a work means to do anything with it that, without
a header file that is part of the Library. You may convey such object permission, would make you directly or secondarily liable for
code under terms of your choice, provided that, if the incorporated infringement under applicable copyright law, except executing it on a
material is not limited to numerical parameters, data structure computer or modifying a private copy. Propagation includes copying,
layouts and accessors, or small macros, inline functions and templates distribution (with or without modification), making available to the
(ten or fewer lines in length), you do both of the following: public, and in some countries other activities as well.
a) Give prominent notice with each copy of the object code that the To "convey" a work means any kind of propagation that enables other
Library is used in it and that the Library and its use are parties to make or receive copies. Mere interaction with a user through
covered by this License. a computer network, with no transfer of a copy, is not conveying.
b) Accompany the object code with a copy of the GNU GPL and this license An interactive user interface displays "Appropriate Legal Notices"
document. to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
4. Combined Works. 1. Source Code.
You may convey a Combined Work under terms of your choice that, The "source code" for a work means the preferred form of the work
taken together, effectively do not restrict modification of the for making modifications to it. "Object code" means any non-source
portions of the Library contained in the Combined Work and reverse form of a work.
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that A "Standard Interface" means an interface that either is an official
the Library is used in it and that the Library and its use are standard defined by a recognized standards body, or, in the case of
covered by this License. interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
b) Accompany the Combined Work with a copy of the GNU GPL and this license The "System Libraries" of an executable work include anything, other
document. than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
c) For a Combined Work that displays copyright notices during The "Corresponding Source" for a work in object code form means all
execution, include the copyright notice for the Library among the source code needed to generate, install, and (for an executable
these notices, as well as a reference directing the user to the work) run the object code and to modify the work, including scripts to
copies of the GNU GPL and this license document. control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
d) Do one of the following: The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
0) Convey the Minimal Corresponding Source under the terms of this The Corresponding Source for a work in source code form is that
License, and the Corresponding Application Code in a form same work.
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the 2. Basic Permissions.
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise All rights granted under this License are granted for the term of
be required to provide such information under section 6 of the copyright on the Program, and are irrevocable provided the stated
GNU GPL, and only to the extent that such information is conditions are met. This License explicitly affirms your unlimited
necessary to install and execute a modified version of the permission to run the unmodified Program. The output from running a
Combined Work produced by recombining or relinking the covered work is covered by this License only if the output, given its
Application with a modified version of the Linked Version. (If content, constitutes a covered work. This License acknowledges your
you use option 4d0, the Installation Information must accompany rights of fair use or other equivalent, as provided by copyright law.
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries. You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
You may place library facilities that are a work based on the Conveying under any other circumstances is permitted solely under
Library side by side in a single library together with other library the conditions stated below. Sublicensing is not allowed; section 10
facilities that are not Applications and are not covered by this makes it unnecessary.
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it No covered work shall be deemed part of an effective technological
is a work based on the Library, and explaining where to find the measure under any applicable law fulfilling obligations under article
accompanying uncombined form of the same work. 11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
6. Revised Versions of the GNU Lesser General Public License. When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
The Free Software Foundation may publish revised and/or new versions 4. Conveying Verbatim Copies.
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the You may convey verbatim copies of the Program's source code as you
Library as you received it specifies that a certain numbered version receive it, in any medium, provided that you conspicuously and
of the GNU Lesser General Public License "or any later version" appropriately publish on each copy an appropriate copyright notice;
applies to it, you have the option of following the terms and keep intact all notices stating that this License and any
conditions either of that published version or of any later version non-permissive terms added in accord with section 7 apply to the code;
published by the Free Software Foundation. If the Library as you keep intact all notices of the absence of any warranty; and give all
received it does not specify a version number of the GNU Lesser recipients a copy of this License along with the Program.
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide You may charge any price or no price for each copy that you convey,
whether future versions of the GNU Lesser General Public License shall and you may offer support or warranty protection for a fee.
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the 5. Conveying Modified Source Versions.
Library.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
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 Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.

View File

@ -22,6 +22,8 @@ Roadmap
------- -------
What follows is a list roadmap of features and the (approximate) versions in which they will be implemented. The API will only change in major versions of the library, while minor versions will be dedicated to internal improvements and patch versions to small fixes that got past the release. What follows is a list roadmap of features and the (approximate) versions in which they will be implemented. The API will only change in major versions of the library, while minor versions will be dedicated to internal improvements and patch versions to small fixes that got past the release.
_NOTE: This roadmap will require modifications._
- v1.0-alpha: - v1.0-alpha:
- [ ] Node connectivity - [ ] Node connectivity
- [ ] Messages properly sent and received - [ ] Messages properly sent and received
@ -48,14 +50,14 @@ _There are currently no clients available._
Compiling Compiling
--------- ---------
To build this project you will need a C99 compatible compiler ([GCC](https://gcc.gnu.org/) is recommended), a POSIX threads compatible system, and the [CMake build system](https://cmake.org/). To build run the following commands from the root directory of the project. To build this project you will need a C++11 compatible compiler ([GCC](https://gcc.gnu.org/) is recommended), the [OpenDHT library](https://github.com/savoirfairelinux/opendht), and the [CMake build system](https://cmake.org/). To build run the following commands from the root directory of the project.
``` ```
$ cd build/ $ cd build/
$ cmake .. $ cmake ..
$ make $ make
``` ```
By default this will build a `release` build, if you require a debug build run the `cmake` command with the additional flag `-DCMAKE_BUILD_TYPE=debug`. By default this will build a `release` build, if you require a debug build run the `cmake` command with the additional flag `-DCMAKE_BUILD_TYPE=debug`. It will also build a static library by default, in order to compile a dynamic library add the flag `-DBUILD_SHARED_LIB=ON`.
Contributing Contributing
------------ ------------
@ -63,4 +65,4 @@ If you would like to contribute to the project please read over the [contributio
License License
------- -------
This project, unless otherwise stated, is licensed under the terms & conditions of the [GNU Lesser General Public License version 3 or greater](/LICENSE). This project, unless otherwise stated, is licensed under the terms & conditions of the [GNU Affero General Public License version 3 or greater](/LICENSE).

View File

@ -1,117 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#pragma once
/**
* @file connectivity.h
* @brief Interfaces relating to node connections.
*/
/**
* @brief Simple address structure providing IP/DNS and port information.
*/
struct NeoComm_address {
const char *address; ///< IP/DNS string.
unsigned short port; ///< Port of address.
};
/**
* @brief Structure used for NeoComm nodes.
*/
struct NeoComm_node {
/// The address of the node.
struct NeoComm_address address;
/// Whether or not it is a directory node/server.
int directory;
/// Number of connections a directory has.
unsigned int connections;
/// Maximum number of connections the directory can have.
unsigned int max_connections;
};
/**
* @brief Initialize the directory aspect of the node.
*
* @param max_num_nodes Maximum number of nodes in the directory.
* @param portnum Public facing port which other nodes can connect to.
*
* @return If the operation failed then a 0 will be returned and the error can
* be read from the NeoComm_get_last_error function, else 1 is returned.
*/
int NeoComm_init_directory(const unsigned int max_num_nodes,
const unsigned short portnum);
/**
* @brief Disconnect from all nodes and free memory.
*/
void NeoComm_shutdown_directory();
/**
* @brief Resize the directory.
* @note This function only increments the size, it currently does not have
* the ability to decrease size.
*
* @param new_max_num_nodes The new maximum number of nodes in the directory.
*
* @return If the operation failed then a 0 will be returned and the error can
* be read from the NeoComm_get_last_error function, else 1 is returned.
*/
int NeoComm_resize_directory(const unsigned int new_max_num_nodes);
/**
* @brief Get the current maximum number of nodes for the directory.
*
* @return The current maximum number of nodes for the directory.
*/
unsigned int NeoComm_get_directory_size();
/**
* @brief Get the current number of nodes registered in the directory.
*
* @return The current number of nodes in the directory.
*/
unsigned int NeoComm_get_num_nodes();
/**
* @brief Add and connect to a new node to the directory.
*
* @param addr The address of the new node to connect to.
*
* @return If the operation failed then a 0 will be returned and the error can
* be read from the NeoComm_get_last_error function, else 1 is returned.
*/
int NeoComm_add_node(const struct NeoComm_address addr);
/**
* @brief Disconnect and remove a node from the directory.
*
* @param addr The address of the node to remove.
*/
void NeoComm_remove_node(const struct NeoComm_address addr);
/**
* @brief Retrieve information on a specific node.
*
* @param addr The address of the node to retrieve.
*
* @return A NeoComm_node structure of the node.
*/
struct NeoComm_node NeoComm_get_node(const struct NeoComm_address addr);

View File

@ -1,27 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#pragma once
/**
* @brief Return the error caused by the last function call.
*
* @return A string with the error.
*/
const char* NeoComm_get_last_error();

View File

@ -1,23 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "neocomm/error.h"
#include "neocomm/connectivity.h"

View File

@ -1,306 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "neocomm/connectivity.h"
#include "iconnectivity.h"
#include "ierror.h"
#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>
#include <string.h>
#include <strings.h>
#include <stdio.h>
#include <stdlib.h>
static struct NeoComm_directory_node *node_list = NULL;
static unsigned int max_nodes;
static unsigned int num_nodes;
static int run;
static int sockfd;
static pthread_t accept_thread;
/*
* This is a protected bind function that is not accessible as a public
* interface.
*/
int NeoComm_bind(const unsigned short port) {
struct sockaddr_in serv_addr;
sockfd = socket(AF_INET, SOCK_STREAM, 0);
if(sockfd < 0)
{
/*
* This declaration is here because if you put it at `default:' then
* it complains about the line being a declaration and not a
* statement.
*/
char error_msg[128];
switch(errno) {
case EACCES:
NeoComm_error("Insufficient privileges");
break;
case ENOBUFS:
NeoComm_error("Insufficient resources available");
break;
case ENOMEM:
NeoComm_error("Insufficient memory to open socket");
break;
default:
snprintf(error_msg, 128,
"Failed to initiate socket with errno `%d'", errno);
NeoComm_error(error_msg);
break;
}
return 0;
}
bzero((char*) &serv_addr, sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
serv_addr.sin_port = htons(port);
serv_addr.sin_addr.s_addr = INADDR_ANY;
if(bind(sockfd, (struct sockaddr*) &serv_addr, sizeof(serv_addr)) < 0)
{
char error_msg[128]; // same as before
switch(errno) {
case EADDRINUSE:
NeoComm_error("Address in use");
break;
case EADDRNOTAVAIL:
NeoComm_error("Address unavailable on system");
break;
case EAFNOSUPPORT:
NeoComm_error("Unsupported address family for socket");
break;
case EALREADY:
NeoComm_error("Assignment request already exists for socket");
break;
case EINVAL:
NeoComm_error("Socket already bound");
break;
case ENOBUFS:
NeoComm_error("Insufficient resources");
break;
case EACCES:
NeoComm_error("Insufficient privileges");
break;
default:
snprintf(error_msg, 128,
"Failed to bind to socket with errno `%d'", errno);
NeoComm_error(error_msg);
break;
}
return 0;
}
listen(sockfd, 5);
return 1;
}
void *NeoComm_connect_manager() {
// Allow for thread to be cancelled asynchronously
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
while(run)
{
int cli_sockfd;
struct sockaddr_in cli_addr;
socklen_t size_cli_addr = sizeof(cli_addr);
cli_sockfd = accept(sockfd, (struct sockaddr*) &cli_addr,
&size_cli_addr);
if(cli_sockfd < 0)
{
NeoComm_error("Error on accept");
continue;
}
++num_nodes;
// TODO: Add the new connection and have it listen on a new thread.
}
pthread_exit(NULL);
}
int NeoComm_init_directory(const unsigned int max_num_nodes,
const unsigned short portnum) {
if(node_list)
{
NeoComm_error("Already running");
return 0;
}
if(max_num_nodes == 0)
{
NeoComm_error("Insufficient number of nodes");
return 0;
}
if(!NeoComm_bind(portnum))
return 0;
node_list = calloc(max_num_nodes, sizeof(struct NeoComm_directory_node));
if(!node_list)
{
NeoComm_error("Failed to allocate memory to directory node list");
return 0;
}
max_nodes = max_num_nodes;
num_nodes = 0;
for(unsigned int i = 0; i < max_nodes; ++i)
node_list[i].in_use = 0;
run = 1;
int err = pthread_create(&accept_thread, NULL,
NeoComm_connect_manager, NULL);
if(err != 0)
{
NeoComm_error("Insufficient resources to create thread");
return 0;
}
return 1;
}
void NeoComm_shutdown_directory() {
if(!node_list)
return;
run = 0;
pthread_cancel(accept_thread);
for(unsigned int i = 0; i < num_nodes; ++i)
{
pthread_cancel(node_list[i].thread);
close(node_list[i].sockfd);
}
num_nodes = 0;
close(sockfd);
free(node_list);
node_list = NULL;
max_nodes = 0;
pthread_exit(NULL);
}
int NeoComm_resize_directory(const unsigned int new_max_num_nodes) {
if(!node_list)
{
NeoComm_error("Directory not initialized");
return 0;
}
if(new_max_num_nodes == max_nodes)
return 1;
else if(new_max_num_nodes < max_nodes)
{
NeoComm_error("Cannot downsize directory size");
return 0;
}
void *tmp_list = realloc(node_list,
new_max_num_nodes * sizeof(struct NeoComm_directory_node));
if(!tmp_list)
{
NeoComm_error("Failed to allocate more memory");
return 0;
}
for(unsigned int i = max_nodes; i < new_max_num_nodes; ++i)
node_list[i].in_use = 0;
max_nodes = new_max_num_nodes;
return 1;
}
unsigned int NeoComm_get_directory_size() {
return max_nodes;
}
unsigned int NeoComm_get_num_nodes() {
return num_nodes;
}
int NeoComm_add_node(const struct NeoComm_address addr) {
if(num_nodes == max_nodes)
{
NeoComm_error("Directory full");
return 0;
}
struct hostent *host = gethostbyname(addr.address);
if(!host)
{
NeoComm_error("Error getting host");
return 0;
}
unsigned int i;
for(i = 0; i < max_nodes; ++i)
{
if(!node_list[i].in_use)
break;
}
bzero((char*) &node_list[i].addr, sizeof(node_list[i].addr));
node_list[i].addr.sin_family = AF_INET;
bcopy((char*) host->h_addr_list[0],
(char*) &node_list[i].addr.sin_addr.s_addr,
host->h_length);
node_list[i].addr.sin_port = htons(addr.port);
if(connect(node_list[i].sockfd,
(struct sockaddr*) &node_list[i].addr,
sizeof(node_list[i].addr)) < 0)
{
NeoComm_error("Failed to connect to new node");
return 0;
}
node_list[i].in_use = 1;
++num_nodes;
// TODO: listen to node on new thread
return 1;
}
void NeoComm_remove_node(const struct NeoComm_address addr) {
struct hostent *host = gethostbyname(addr.address);
if(!host)
return;
unsigned int i;
for(i = 0; i < max_nodes; ++i)
{
if(strncmp((char*) host->h_addr_list[0],
(char*) &node_list[i].addr.sin_addr.s_addr,
host->h_length) == 0)
break;
if(i == max_nodes - 1)
++i;
}
if(i == max_nodes)
return;
pthread_cancel(node_list[i].thread);
close(node_list[i].sockfd);
node_list[i].in_use = 0;
--num_nodes;
}

View File

@ -1,34 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "neocomm/error.h"
#include "ierror.h"
#include <assert.h>
static const char *neocomm_error;
void NeoComm_error(const char *error) {
assert(error);
neocomm_error = error;
}
const char* NeoComm_get_last_error() {
return neocomm_error;
}

View File

@ -1,40 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <netinet/in.h>
#include <pthread.h>
/*
* This is an internal structure for nodes.
*/
struct NeoComm_directory_node {
int in_use;
struct sockaddr_in addr;
int sockfd;
pthread_t thread;
int open_directory;
unsigned int connections;
unsigned int max_connections;
};
int NeoComm_bind(unsigned short portnum);
void *NeoComm_connect_manager();

View File

@ -1,22 +0,0 @@
/*
* Copyright (C) 2017 Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
* Author: Ortega Froysa, Nicolás <deathsbreed@themusicinnoise.net>
*
* This program 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, either
* version 3 of the License, or (at your option) any later version.
*
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
*/
#pragma once
void NeoComm_error(const char* error);