changed offending cnmat licences to current one

svn path=/trunk/externals/OSCx/; revision=1961

1 files changed, 28 insertions, 36 deletions

diff --git a/src/htmsocket.c b/src/htmsocket.c
index b9ba16c..3bcf3b9 100644
--- a/src/htmsocket.c
+++ b/src/htmsocket.c
@@ -1,30 +1,27 @@
 /*

-Copyright (c) 1992,1996,1998.  

-The Regents of the University of California (Regents).

-All Rights Reserved.

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for educational, research, and not-for-profit purposes, without

-fee and without a signed licensing agreement, is hereby granted, provided that

-the above copyright notice, this paragraph and the following two paragraphs

-appear in all copies, modifications, and distributions.  Contact The Office of

-Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,

-CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.

-

 Written by Adrian Freed, The Center for New Music and Audio Technologies,

-University of California, Berkeley.

-

-     IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,

-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,

-     ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF

-     REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT

-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

-     FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING

-     DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".

-     REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,

-     ENHANCEMENTS, OR MODIFICATIONS.

+University of California, Berkeley.  Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04

+The Regents of the University of California (Regents).  

+

+Permission to use, copy, modify, distribute, and distribute modified versions

+of this software and its documentation without fee and without a signed

+licensing agreement, is hereby granted, provided that the above copyright

+notice, this paragraph and the following two paragraphs appear in all copies,

+modifications, and distributions.

+

+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,

+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING

+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS

+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED

+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE

+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

+

+

+The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl

 */

 

  /* htmsocket.c

@@ -34,6 +31,10 @@ University of California, Berkeley.
 

     Modified 6/6/96 by Matt Wright to understand symbolic host names

     in addition to X.X.X.X addresses.

+

+    pd: branched jdl

+    -- win additions raf 2002

+    -- enabled broadcast jdl 2003

  */

 

 #if HAVE_CONFIG_H 

@@ -83,15 +84,6 @@ University of California, Berkeley.
 	#include <stdlib.h>

 #endif

 

-

-

-

-

-

-

-

-

-

 #define UNIXDG_PATH "/tmp/htm"

 #define UNIXDG_TMP "/tmp/htm.XXXXXX"

 #include "htmsocket.h"                          

@@ -233,7 +225,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 				cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);

 				cl_addr.sin_port = htons(0);

 				

-				// enable broadcast

+				// enable broadcast: jdl ~2003

 				if(setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &oval, sizeof(int)) == -1) {

 				  perror("setsockopt");

 				}

@@ -254,7 +246,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 				cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);

 				cl_addr.sin_port = htons(0);

 				

-				// enable broadcast

+				// enable broadcast: jdl ~2003

 				if(setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &oval, sizeof(int)) == -1) {

 				  perror("setsockopt");

 				}