[xiph-commits] r6841 - in icecast/branches: . net-shout-kh
j at dactyl.lonelymoon.com
j
Fri Jun 25 13:46:32 PDT 2004
Author: j
Date: Fri Jun 25 13:46:32 2004
New Revision: 6841
Added:
icecast/branches/net-shout-kh/
icecast/branches/net-shout-kh/COPYING
icecast/branches/net-shout-kh/Makefile.am
icecast/branches/net-shout-kh/README
icecast/branches/net-shout-kh/TODO
icecast/branches/net-shout-kh/resolver.c
icecast/branches/net-shout-kh/resolver.h
icecast/branches/net-shout-kh/sock.c
icecast/branches/net-shout-kh/sock.h
Log:
import of net-shout-kh
Added: icecast/branches/net-shout-kh/COPYING
===================================================================
--- icecast/branches/net-shout-kh/COPYING 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/COPYING 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,481 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service 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.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey 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 library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
Added: icecast/branches/net-shout-kh/Makefile.am
===================================================================
--- icecast/branches/net-shout-kh/Makefile.am 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/Makefile.am 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,19 @@
+## Process this with automake to create Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_LTLIBRARIES = libicenet.la
+noinst_HEADERS = resolver.h sock.h
+
+libicenet_la_SOURCES = sock.c resolver.c
+libicenet_la_CFLAGS = @XIPH_CFLAGS@
+AM_CPPFLAGS = @XIPH_CPPFLAGS@
+
+INCLUDES = -I$(srcdir)/..
+
+debug:
+ $(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+ $(MAKE) all CFLAGS="@PROFILE@
+
Added: icecast/branches/net-shout-kh/README
===================================================================
--- icecast/branches/net-shout-kh/README 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/README 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,10 @@
+This is a name resolving library that's threadsafe.
+
+Right now it only implements this with mutexes, but we should extend it to use gethostbyXXXX_r()
+if it's available.
+
+It shoudl work on win32, but i'm probably forgetting a headerfile.
+
+API is basically not going to change. Please consult with the rest of the team before changing the interface.
+
+jack.
\ No newline at end of file
Added: icecast/branches/net-shout-kh/TODO
===================================================================
--- icecast/branches/net-shout-kh/TODO 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/TODO 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1 @@
+- add getXbyY_r function support
Added: icecast/branches/net-shout-kh/resolver.c
===================================================================
--- icecast/branches/net-shout-kh/resolver.c 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/resolver.c 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,213 @@
+/*
+** resolver.c
+**
+** name resolver library
+**
+*/
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#else
+#include <winsock2.h>
+#endif
+
+#ifndef NO_THREAD
+#include <thread/thread.h>
+#else
+#define thread_mutex_create(x) do{}while(0)
+#define thread_mutex_destroy(x) do{}while(0)
+#define thread_mutex_lock(x) do{}while(0)
+#define thread_mutex_unlock(x) do{}while(0)
+#endif
+
+#include "resolver.h"
+#include "sock.h"
+
+/* internal function */
+
+static int _isip(const char *what);
+
+/* internal data */
+
+#ifndef NO_THREAD
+static mutex_t _resolver_mutex;
+#endif
+static int _initialized = 0;
+
+#ifdef HAVE_INET_PTON
+static int _isip(const char *what)
+{
+ union {
+ struct in_addr v4addr;
+ struct in6_addr v6addr;
+ } addr_u;
+
+ if (inet_pton(AF_INET, what, &addr_u.v4addr) <= 0)
+ return inet_pton(AF_INET6, what, &addr_u.v6addr) > 0 ? 1 : 0;
+
+ return 1;
+}
+
+#else
+static int _isip(const char *what)
+{
+ struct in_addr inp;
+
+ return inet_aton(what, &inp);
+}
+#endif
+
+
+#if defined (HAVE_GETNAMEINFO) && defined (HAVE_GETADDRINFO)
+char *resolver_getname(const char *ip, char *buff, int len)
+{
+ struct addrinfo *head = NULL, hints;
+ char *ret = NULL;
+
+ if (!_isip(ip)) {
+ strncpy(buff, ip, len);
+ buff [len-1] = '\0';
+ return buff;
+ }
+
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_CANONNAME;
+ if (getaddrinfo (ip, NULL, &hints, &head))
+ return NULL;
+
+ if (head)
+ {
+ if (getnameinfo(head->ai_addr, head->ai_addrlen, buff, len, NULL,
+ 0, NI_NAMEREQD) == 0)
+ ret = buff;
+
+ freeaddrinfo (head);
+ }
+
+ return ret;
+}
+
+
+char *resolver_getip(const char *name, char *buff, int len)
+{
+ struct addrinfo *head, hints;
+ char *ret = NULL;
+
+ if (_isip(name)) {
+ strncpy(buff, name, len);
+ buff [len-1] = '\0';
+ return buff;
+ }
+
+ memset (&hints, 0, sizeof (hints));
+ hints . ai_family = AF_UNSPEC;
+ hints . ai_socktype = SOCK_STREAM;
+ if (getaddrinfo (name, NULL, &hints, &head))
+ return NULL;
+
+ if (head)
+ {
+ if (getnameinfo(head->ai_addr, head->ai_addrlen, buff, len, NULL,
+ 0, NI_NUMERICHOST) == 0)
+ ret = buff;
+ freeaddrinfo (head);
+ }
+
+ return ret;
+}
+
+#else
+
+char *resolver_getname(const char *ip, char *buff, int len)
+{
+ struct hostent *host;
+ char *ret = NULL;
+ struct in_addr addr;
+
+ if (! _isip(ip))
+ {
+ strncpy(buff, ip, len);
+ buff [len-1] = '\0';
+ return buff;
+ }
+
+ thread_mutex_lock(&_resolver_mutex);
+ if (inet_aton (ip, &addr)) {
+ if ((host=gethostbyaddr (&addr, sizeof (struct in_addr), AF_INET)))
+ {
+ ret = strncpy (buff, host->h_name, len);
+ buff [len-1] = '\0';
+ }
+ }
+
+ thread_mutex_unlock(&_resolver_mutex);
+ return ret;
+}
+
+char *resolver_getip(const char *name, char *buff, int len)
+{
+ struct hostent *host;
+ char *ret = NULL;
+
+ if (_isip(name))
+ {
+ strncpy(buff, name, len);
+ buff [len-1] = '\0';
+ return buff;
+ }
+ thread_mutex_lock(&_resolver_mutex);
+ host = gethostbyname(name);
+ if (host)
+ {
+ char * temp = inet_ntoa(*(struct in_addr *)host->h_addr);
+ ret = strncpy(buff, temp, len);
+ buff [len-1] = '\0';
+ }
+ thread_mutex_unlock(&_resolver_mutex);
+
+ return ret;
+}
+#endif
+
+
+void resolver_initialize()
+{
+ /* initialize the lib if we havne't done so already */
+
+ if (!_initialized)
+ {
+ _initialized = 1;
+ thread_mutex_create (&_resolver_mutex);
+
+ /* keep dns connects (TCP) open */
+#ifdef HAVE_SETHOSTENT
+ sethostent(1);
+#endif
+ }
+}
+
+void resolver_shutdown(void)
+{
+ if (_initialized)
+ {
+ thread_mutex_destroy(&_resolver_mutex);
+ _initialized = 0;
+#ifdef HAVE_ENDHOSTENT
+ endhostent();
+#endif
+ }
+}
+
Added: icecast/branches/net-shout-kh/resolver.h
===================================================================
--- icecast/branches/net-shout-kh/resolver.h 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/resolver.h 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,34 @@
+/*
+** resolver.h
+**
+** name resolver library header
+**
+*/
+
+#ifndef __RESOLVER_H
+#define __RESOLVER_H
+
+
+/*
+** resolver_lookup
+**
+** resolves a hosts name from it's ip address
+** or
+** resolves an ip address from it's host name
+**
+** returns a pointer to buff, or NULL if an error occured
+**
+*/
+
+void resolver_initialize(void);
+void resolver_shutdown(void);
+
+char *resolver_getname(const char *ip, char *buff, int len);
+char *resolver_getip(const char *name, char *buff, int len);
+
+#endif
+
+
+
+
+
Added: icecast/branches/net-shout-kh/sock.c
===================================================================
--- icecast/branches/net-shout-kh/sock.c 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/sock.c 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,806 @@
+/* -*- c-basic-offset: 4; -*- */
+/* sock.c: General Socket Functions
+ *
+ * Copyright (c) 1999 the icecast team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifndef _WIN32
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <netdb.h>
+#else
+#include <winsock2.h>
+#define vsnprintf _vsnprintf
+#define EINPROGRESS WSAEINPROGRESS
+#define ENOTSOCK WSAENOTSOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EALREADY WSAEALREADY
+#define socklen_t int
+#ifndef __MINGW32__
+#define va_copy(ap1, ap2) memcpy(&ap1, &ap2, sizeof(va_list))
+#endif
+#endif
+
+#include "sock.h"
+#include "resolver.h"
+
+/* sock_initialize
+**
+** initializes the socket library. you must call this
+** before using the library!
+*/
+void sock_initialize(void)
+{
+#ifdef _WIN32
+ WSADATA wsad;
+ WSAStartup(0x0101, &wsad);
+#endif
+
+ resolver_initialize();
+}
+
+/* sock_shutdown
+**
+** shutdown the socket library. remember to call this when you're
+** through using the lib
+*/
+void sock_shutdown(void)
+{
+#ifdef _WIN32
+ WSACleanup();
+#endif
+
+ resolver_shutdown();
+}
+
+/* sock_get_localip
+**
+** gets the local ip address for the machine
+** the ip it returns *should* be on the internet.
+** in any case, it's as close as we can hope to get
+** unless someone has better ideas on how to do this
+*/
+char *sock_get_localip(char *buff, int len)
+{
+ char temp[1024];
+
+ if (gethostname(temp, sizeof(temp)) != 0)
+ return NULL;
+
+ if (resolver_getip(temp, buff, len))
+ return buff;
+
+ return NULL;
+}
+
+/* sock_error
+**
+** returns the last socket error
+*/
+int sock_error(void)
+{
+#ifdef _WIN32
+ return WSAGetLastError();
+#else
+ return errno;
+#endif
+}
+
+static void sock_set_error(int val)
+{
+#ifdef _WIN32
+ WSASetLastError (val);
+#else
+ errno = val;
+#endif
+}
+
+/* sock_recoverable
+**
+** determines if the socket error is recoverable
+** in terms of non blocking sockets
+*/
+int sock_recoverable(int error)
+{
+ switch (error)
+ {
+ case 0:
+ case EAGAIN:
+ case EINTR:
+ case EINPROGRESS:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+ case EWOULDBLOCK:
+#endif
+#ifdef ERESTART
+ case ERESTART:
+#endif
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+int sock_stalled (int error)
+{
+ switch (error)
+ {
+ case EAGAIN:
+ case EINPROGRESS:
+ case EALREADY:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+ case EWOULDBLOCK:
+#endif
+#ifdef ERESTART
+ case ERESTART:
+#endif
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+
+static int sock_connect_pending (int error)
+{
+ return error == EINPROGRESS || error == EALREADY;
+}
+
+/* sock_valid_socket
+**
+** determines if a sock_t represents a valid socket
+*/
+int sock_valid_socket(sock_t sock)
+{
+ int ret;
+ int optval;
+ socklen_t optlen;
+
+ optlen = sizeof(int);
+ /* apparently on windows getsockopt.optval is a char * */
+ ret = getsockopt(sock, SOL_SOCKET, SO_TYPE, (void*) &optval, &optlen);
+
+ return (ret == 0);
+}
+
+/* inet_aton
+**
+** turns an ascii ip address into a binary representation
+*/
+#ifdef _WIN32
+int inet_aton(const char *s, struct in_addr *a)
+{
+ int lsb, b2, b3, msb;
+
+ if (sscanf(s, "%d.%d.%d.%d", &lsb, &b2, &b3, &msb) < 4) {
+ return 0;
+ }
+
+ a->s_addr = inet_addr(s);
+
+ return (a->s_addr != INADDR_NONE);
+}
+#endif /* _WIN32 */
+
+/* sock_set_blocking
+**
+** set the sock blocking or nonblocking
+** SOCK_BLOCK for blocking
+** SOCK_NONBLOCK for nonblocking
+*/
+int sock_set_blocking(sock_t sock, const int block)
+{
+#ifdef _WIN32
+#ifdef __MINGW32__
+ u_long varblock = block;
+#else
+ int varblock = block;
+#endif
+#endif
+
+ if ((!sock_valid_socket(sock)) || (block < 0) || (block > 1))
+ return SOCK_ERROR;
+
+#ifdef _WIN32
+ return ioctlsocket(sock, FIONBIO, &varblock);
+#else
+ return fcntl(sock, F_SETFL, (block == SOCK_BLOCK) ? 0 : O_NONBLOCK);
+#endif
+}
+
+int sock_set_nolinger(sock_t sock)
+{
+ struct linger lin = { 0, 0 };
+ return setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *)&lin,
+ sizeof(struct linger));
+}
+
+int sock_set_nodelay(sock_t sock)
+{
+ int nodelay = 1;
+
+ return setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *)&nodelay,
+ sizeof(int));
+}
+
+int sock_set_keepalive(sock_t sock)
+{
+ int keepalive = 1;
+ return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive,
+ sizeof(int));
+}
+
+/* sock_close
+**
+** close the socket
+*/
+int sock_close(sock_t sock)
+{
+#ifdef _WIN32
+ return closesocket(sock);
+#else
+ return close(sock);
+#endif
+}
+
+/* sock_writev
+ *
+ * write multiple buffers at once, return bytes actually written
+ */
+#ifdef HAVE_WRITEV
+
+ssize_t sock_writev (int sock, const struct iovec *iov, const size_t count)
+{
+ return writev (sock, iov, count);
+}
+
+#else
+
+ssize_t sock_writev (int sock, const struct iovec *iov, const size_t count)
+{
+ int i = count, accum = 0, ret;
+ const struct iovec *v = iov;
+
+ while (i)
+ {
+ if (v->iov_base && v->iov_len)
+ {
+ ret = sock_write_bytes (sock, v->iov_base, v->iov_len);
+ if (ret == -1 && accum==0)
+ return -1;
+ if (ret == -1)
+ ret = 0;
+ accum += ret;
+ if (ret < (int)v->iov_len)
+ break;
+ }
+ v++;
+ i--;
+ }
+ return accum;
+}
+
+#endif
+
+/* sock_write_bytes
+**
+** write bytes to the socket
+** this function will _NOT_ block
+*/
+int sock_write_bytes(sock_t sock, const void *buff, const size_t len)
+{
+ /* sanity check */
+ if (!buff) {
+ return SOCK_ERROR;
+ } else if (len <= 0) {
+ return SOCK_ERROR;
+ } /*else if (!sock_valid_socket(sock)) {
+ return SOCK_ERROR;
+ } */
+
+ return send(sock, buff, len, 0);
+}
+
+/* sock_write_string
+**
+** writes a string to a socket
+** This function must only be called with a blocking socket.
+*/
+int sock_write_string(sock_t sock, const char *buff)
+{
+ return (sock_write_bytes(sock, buff, strlen(buff)) > 0);
+}
+
+/* sock_write
+**
+** write a formatted string to the socket
+** this function must only be called with a blocking socket.
+** will truncate the string if it's greater than 1024 chars.
+*/
+int sock_write(sock_t sock, const char *fmt, ...)
+{
+ int rc;
+ va_list ap;
+
+ va_start (ap, fmt);
+ rc = sock_write_fmt (sock, fmt, ap);
+ va_end (ap);
+
+ return rc;
+}
+
+int sock_write_fmt(sock_t sock, const char *fmt, va_list ap)
+{
+ char buffer [1024], *buff = buffer;
+ int len;
+ int rc = SOCK_ERROR;
+ va_list ap_retry;
+
+ va_copy (ap_retry, ap);
+
+ len = vsnprintf (buff, sizeof (buffer), fmt, ap);
+
+ if (len > 0)
+ {
+ if ((size_t)len < sizeof (buffer)) /* common case */
+ rc = sock_write_bytes(sock, buff, (size_t)len);
+ else
+ {
+ /* truncated */
+ buff = malloc (++len);
+ if (buff)
+ {
+ len = vsnprintf (buff, len, fmt, ap_retry);
+ if (len > 0)
+ rc = sock_write_bytes (sock, buff, len);
+ free (buff);
+ }
+ }
+ }
+ va_end (ap_retry);
+
+ return rc;
+}
+
+
+/* function to check if there are any pending reads on
+ the stated socket. timeout in ms, 0 for immediate
+ return */
+int sock_read_pending(sock_t sock, const unsigned timeout)
+{
+ struct timeval tv;
+ fd_set rfds;
+
+ tv.tv_sec = timeout/1000;
+ tv.tv_usec = (timeout%1000)*1000;
+
+ FD_ZERO(&rfds);
+ FD_SET(sock, &rfds);
+
+ switch (select(sock + 1, &rfds, NULL, NULL, &tv))
+ {
+ case 0: return SOCK_TIMEOUT;
+ default: return 1;
+ case -1: return SOCK_ERROR;
+ }
+}
+
+
+int sock_read_bytes(sock_t sock, char *buff, const unsigned len)
+{
+ if (!buff) return 0;
+ if (len <= 0) return 0;
+
+ return recv(sock, buff, len, 0);
+}
+
+/* sock_read_line
+**
+** Read one line of at max len bytes from sock into buff.
+** If ok, return 1 and nullterminate buff. Otherwize return 0.
+** Terminating \n is not put into the buffer.
+**
+** this function will probably not work on sockets in nonblocking mode
+*/
+int sock_read_line(sock_t sock, char *buff, const int len)
+{
+ char c = '\0';
+ int read_bytes, pos;
+
+ /*if (!sock_valid_socket(sock)) {
+ return 0;
+ } else*/ if (!buff) {
+ return 0;
+ } else if (len <= 0) {
+ return 0;
+ }
+
+ pos = 0;
+ read_bytes = recv(sock, &c, 1, 0);
+
+ if (read_bytes < 0) {
+ return 0;
+ }
+
+ while ((c != '\n') && (pos < len) && (read_bytes == 1)) {
+ if (c != '\r')
+ buff[pos++] = c;
+ read_bytes = recv(sock, &c, 1, 0);
+ }
+
+ if (read_bytes == 1) {
+ buff[pos] = '\0';
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+/* see if a connection is established, timeout < 0 waits forever
+ * return SOCK_TIMEOUT for timeout
+ * return SOCK_ERROR for failure
+ * return 0 for try again
+ * return 1 for ok
+ */
+int sock_connected (int sock, int timeout)
+{
+ fd_set wfds;
+ int val = SOCK_ERROR;
+ socklen_t size = sizeof val;
+ struct timeval tv, *timeval = NULL;
+
+
+ FD_ZERO(&wfds);
+ FD_SET(sock, &wfds);
+
+ switch (select(sock + 1, NULL, &wfds, NULL, timeval))
+ {
+ case 0:
+ return SOCK_TIMEOUT;
+ default:
+ /* on windows getsockopt.val is defined as char* */
+ if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*) &val, &size) == 0)
+ {
+ if (val == 0)
+ return 1;
+ sock_set_error (val);
+ }
+ case -1:
+ if (sock_recoverable (sock_error()))
+ return 0;
+ return SOCK_ERROR;
+ }
+}
+
+#ifdef HAVE_GETADDRINFO
+
+int sock_connect_non_blocking (const char *hostname, const unsigned port)
+{
+ int sock = SOCK_ERROR;
+ struct addrinfo *ai, *head, hints;
+ char service[8];
+
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+
+ snprintf (service, sizeof (service), "%u", port);
+
+ if (getaddrinfo (hostname, service, &hints, &head))
+ return SOCK_ERROR;
+
+ ai = head;
+ while (ai)
+ {
+ if ((sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol))
+ > -1)
+ {
+ sock_set_blocking (sock, SOCK_NONBLOCK);
+ if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 &&
+ !sock_connect_pending(sock_error()))
+ {
+ sock_close (sock);
+ sock = SOCK_ERROR;
+ }
+ else
+ break;
+ }
+ ai = ai->ai_next;
+ }
+ if (head) freeaddrinfo (head);
+
+ return sock;
+}
+
+
+sock_t sock_connect_wto(const char *hostname, const int port, const int timeout)
+{
+ int sock = SOCK_ERROR;
+ struct addrinfo *ai, *head, hints;
+ char service[8];
+
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ snprintf (service, sizeof (service), "%u", port);
+
+ if (getaddrinfo (hostname, service, &hints, &head))
+ return SOCK_ERROR;
+
+ ai = head;
+ while (ai)
+ {
+ if ((sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol)) >= 0)
+ {
+ if (timeout > 0)
+ sock_set_blocking (sock, SOCK_NONBLOCK);
+
+ if (connect (sock, ai->ai_addr, ai->ai_addrlen) == 0)
+ break;
+
+ /* loop as the connect maybe async */
+ while (sock != SOCK_ERROR)
+ {
+ if (sock_recoverable (sock_error()))
+ {
+ if (sock_connected (sock, timeout) > 0)
+ {
+ if (timeout) /* really wants to reset to what it was before */
+ sock_set_blocking(sock, SOCK_BLOCK);
+ break;
+ }
+ continue;
+ }
+ sock_close (sock);
+ sock = SOCK_ERROR;
+ }
+ if (sock != SOCK_ERROR)
+ break;
+ }
+ ai = ai->ai_next;
+ }
+ if (head)
+ freeaddrinfo (head);
+
+ return sock;
+}
+
+#else
+
+int sock_try_connection (int sock, const char *hostname, const unsigned port)
+{
+ struct sockaddr_in sin, server;
+ char ip[MAX_ADDR_LEN];
+
+ if (!hostname || !hostname[0] || port == 0)
+ return -1;
+
+ memset(&sin, 0, sizeof(struct sockaddr_in));
+ memset(&server, 0, sizeof(struct sockaddr_in));
+
+ if (!resolver_getip(hostname, ip, MAX_ADDR_LEN))
+ {
+ sock_close (sock);
+ return -1;
+ }
+
+ if (inet_aton(ip, (struct in_addr *)&sin.sin_addr) == 0)
+ {
+ sock_close(sock);
+ return -1;
+ }
+
+ memcpy(&server.sin_addr, &sin.sin_addr, sizeof(struct sockaddr_in));
+
+ server.sin_family = AF_INET;
+ server.sin_port = htons(port);
+
+ return connect(sock, (struct sockaddr *)&server, sizeof(server));
+}
+
+int sock_connect_non_blocking (const char *hostname, const unsigned port)
+{
+ int sock;
+
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ if (sock == -1)
+ return -1;
+
+ sock_set_blocking (sock, SOCK_NONBLOCK);
+ sock_try_connection (sock, hostname, port);
+
+ return sock;
+}
+
+sock_t sock_connect_wto(const char *hostname, const int port, const int timeout)
+{
+ int sock;
+
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ if (sock == -1)
+ return -1;
+
+ if (timeout > 0)
+ {
+ sock_set_blocking (sock, SOCK_NONBLOCK);
+ if (sock_try_connection (sock, hostname, port) < 0)
+ {
+ int ret = sock_connected (sock, timeout);
+ if (ret <= 0)
+ {
+ sock_close (sock);
+ return SOCK_ERROR;
+ }
+ }
+ sock_set_blocking(sock, SOCK_BLOCK);
+ }
+ else
+ {
+ if (sock_try_connection (sock, hostname, port) < 0)
+ {
+ sock_close (sock);
+ sock = SOCK_ERROR;
+ }
+ }
+ return sock;
+}
+#endif
+
+
+/* sock_get_server_socket
+**
+** create a socket for incoming requests on a specified port and
+** interface. if interface is null, listen on all interfaces.
+** returns the socket, or SOCK_ERROR on failure
+*/
+sock_t sock_get_server_socket(const int port, char *sinterface)
+{
+#ifdef HAVE_INET_PTON
+ struct sockaddr_storage sa;
+#else
+ struct sockaddr_in sa;
+#endif
+ int family, len, error, opt;
+ sock_t sock;
+ char ip[MAX_ADDR_LEN];
+
+ if (port < 0)
+ return SOCK_ERROR;
+
+ /* defaults */
+ memset(&sa, 0, sizeof(sa));
+ family = AF_INET;
+ len = sizeof(struct sockaddr_in);
+
+ /* set the interface to bind to if specified */
+ if (sinterface != NULL) {
+ if (!resolver_getip(sinterface, ip, sizeof (ip)))
+ return SOCK_ERROR;
+
+#ifdef HAVE_INET_PTON
+ if (inet_pton(AF_INET, ip, &((struct sockaddr_in*)&sa)->sin_addr) > 0) {
+ ((struct sockaddr_in*)&sa)->sin_family = AF_INET;
+ ((struct sockaddr_in*)&sa)->sin_port = htons(port);
+ } else if (inet_pton(AF_INET6, ip,
+ &((struct sockaddr_in6*)&sa)->sin6_addr) > 0) {
+ family = AF_INET6;
+ len = sizeof (struct sockaddr_in6);
+ ((struct sockaddr_in6*)&sa)->sin6_family = AF_INET6;
+ ((struct sockaddr_in6*)&sa)->sin6_port = htons(port);
+ } else {
+ return SOCK_ERROR;
+ }
+#else
+ if (!inet_aton(ip, &sa.sin_addr)) {
+ return SOCK_ERROR;
+ } else {
+ sa.sin_family = AF_INET;
+ sa.sin_port = htons(port);
+ }
+#endif
+ } else {
+ ((struct sockaddr_in*)&sa)->sin_addr.s_addr = INADDR_ANY;
+ ((struct sockaddr_in*)&sa)->sin_family = AF_INET;
+ ((struct sockaddr_in*)&sa)->sin_port = htons(port);
+ }
+
+ /* get a socket */
+ sock = socket(family, SOCK_STREAM, 0);
+ if (sock == -1)
+ return SOCK_ERROR;
+
+ /* reuse it if we can */
+ opt = 1;
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const void *)&opt, sizeof(int));
+
+ /* bind socket to port */
+ error = bind(sock, (struct sockaddr *)&sa, len);
+ if (error == -1)
+ return SOCK_ERROR;
+
+ return sock;
+}
+
+int sock_listen(sock_t serversock, int backlog)
+{
+ if (!sock_valid_socket(serversock))
+ return 0;
+
+ if (backlog <= 0)
+ backlog = 10;
+
+ return (listen(serversock, backlog) == 0);
+}
+
+int sock_accept(sock_t serversock, char *ip, int len)
+{
+#ifdef HAVE_INET_PTON
+ struct sockaddr_storage sa;
+#else
+ struct sockaddr_in sa;
+#endif
+ int ret;
+ socklen_t slen;
+
+ if (!sock_valid_socket(serversock))
+ return SOCK_ERROR;
+
+ slen = sizeof(sa);
+ ret = accept(serversock, (struct sockaddr *)&sa, &slen);
+
+ if (ret >= 0 && ip != NULL) {
+#ifdef HAVE_INET_PTON
+ if(((struct sockaddr_in *)&sa)->sin_family == AF_INET)
+ inet_ntop(AF_INET, &((struct sockaddr_in *)&sa)->sin_addr,
+ ip, len);
+ else if(((struct sockaddr_in6 *)&sa)->sin6_family == AF_INET6)
+ inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&sa)->sin6_addr,
+ ip, len);
+ else {
+ strncpy(ip, "ERROR", len-1);
+ ip[len-1] = 0;
+ }
+#else
+ /* inet_ntoa is not reentrant, we should protect this */
+ strncpy(ip, inet_ntoa(sa.sin_addr), len);
+#endif
+ sock_set_nolinger(ret);
+ sock_set_keepalive(ret);
+ }
+
+ return ret;
+}
+
Added: icecast/branches/net-shout-kh/sock.h
===================================================================
--- icecast/branches/net-shout-kh/sock.h 2004-06-24 18:19:55 UTC (rev 6840)
+++ icecast/branches/net-shout-kh/sock.h 2004-06-24 18:20:39 UTC (rev 6841)
@@ -0,0 +1,110 @@
+/* sock.h
+ * - General Socket Function Headers
+ *
+ * Copyright (c) 1999 the icecast team
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __SOCK_H
+#define __SOCK_H
+
+#include <stdarg.h>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <os.h>
+#else
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#else
+#ifndef _SYS_UIO_H
+struct iovec
+{
+ void *iov_base;
+ size_t iov_len;
+};
+#endif
+#endif
+
+#if !defined(HAVE_INET_ATON) && defined(HAVE_INET_PTON)
+#define inet_aton(a,b) inet_pton(AF_INET, (a), (b))
+#endif
+
+#ifdef INET6_ADDRSTRLEN
+#define MAX_ADDR_LEN INET6_ADDRSTRLEN
+#else
+#define MAX_ADDR_LEN 46
+#endif
+
+typedef int sock_t;
+
+/* The following values are based on unix avoiding errno value clashes */
+#define SOCK_SUCCESS 0
+#define SOCK_ERROR -1
+#define SOCK_TIMEOUT -2
+
+#define SOCK_BLOCK 0
+#define SOCK_NONBLOCK 1
+
+/* sock connect macro */
+#define sock_connect(h, p) sock_connect_wto(h, p, 0)
+
+/* Misc socket functions */
+void sock_initialize(void);
+void sock_shutdown(void);
+char *sock_get_localip(char *buff, int len);
+int sock_error(void);
+int sock_recoverable(int error);
+int sock_stalled (int error);
+int sock_valid_socket(sock_t sock);
+int sock_set_blocking(sock_t sock, const int block);
+int sock_set_nolinger(sock_t sock);
+int sock_set_keepalive(sock_t sock);
+int sock_set_nodelay(sock_t sock);
+int sock_close(sock_t sock);
+
+/* Connection related socket functions */
+sock_t sock_connect_wto(const char *hostname, const int port, const int timeout);
+int sock_connect_non_blocking (const char *host, const unsigned port);
+int sock_connected (int sock, int timeout);
+
+/* Socket write functions */
+int sock_write_bytes(sock_t sock, const void *buff, const size_t len);
+int sock_write(sock_t sock, const char *fmt, ...);
+int sock_write_fmt(sock_t sock, const char *fmt, va_list ap);
+int sock_write_string(sock_t sock, const char *buff);
+ssize_t sock_writev (int sock, const struct iovec *iov, const size_t count);
+
+
+/* Socket read functions */
+int sock_read_pending(sock_t sock, const unsigned timeout);
+int sock_read_bytes(sock_t sock, char *buff, const unsigned len);
+int sock_read_line(sock_t sock, char *string, const int len);
+
+/* server socket functions */
+sock_t sock_get_server_socket(const int port, char *sinterface);
+int sock_listen(sock_t serversock, int backlog);
+int sock_accept(sock_t serversock, char *ip, int len);
+
+#ifdef _WIN32
+int inet_aton(const char *s, struct in_addr *a);
+#endif
+
+#endif /* __SOCK_H */
More information about the commits
mailing list