X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=tls.c;h=d969b8287064c608c0fd3acb8558010103f6702a;hp=02886f2b5671a2269642387ebfc912e671db5334;hb=b965b8cc10f094ec0408d57b1bc9aeee0bca501c;hpb=119244d9b13e84eb898f9fb97e83cac260c1a0b5

diff --git a/tls.c b/tls.c
index 02886f2..d969b82 100644
--- a/tls.c
+++ b/tls.c
@@ -1,20 +1,20 @@
 /*
- * uhttpd - Tiny single-threaded httpd - Main header
+ * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <dlfcn.h>
@@ -68,14 +68,14 @@ int uh_tls_init(const char *key, const char *crt)
 
 static void tls_ustream_read_cb(struct ustream *s, int bytes)
 {
-	struct client *cl = container_of(s, struct client, ssl);
+	struct client *cl = container_of(s, struct client, ssl.stream);
 
 	uh_client_read_cb(cl);
 }
 
 static void tls_ustream_write_cb(struct ustream *s, int bytes)
 {
-	struct client *cl = container_of(s, struct client, ssl);
+	struct client *cl = container_of(s, struct client, ssl.stream);
 
 	if (cl->dispatch.write_cb)
 		cl->dispatch.write_cb(cl);
@@ -83,7 +83,7 @@ static void tls_ustream_write_cb(struct ustream *s, int bytes)
 
 static void tls_notify_state(struct ustream *s)
 {
-	struct client *cl = container_of(s, struct client, ssl);
+	struct client *cl = container_of(s, struct client, ssl.stream);
 
 	uh_client_notify_state(cl);
 }