commit 46c2ea0d6fe1ff408470e7c2da0e8bb5a631d0a4
author Andy Green <andy@warmcat.com> Tue Mar 22 09:04:01 2011 +0000
committer Andy Green <andy@warmcat.com> Tue Mar 22 09:04:01 2011 +0000
tree 15b8fe43b793d342a8cb43e3f13222fafc8928d0
parent 6eeadae1ab482d527c872f239d74351282c97060

pass ext pointer in ext callback

Signed-off-by: Andy Green <andy@warmcat.com>

lib/libwebsockets.c

diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 717f6c0..6a0ef37 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -182,7 +182,8 @@
 
 		for (n = 0; n < wsi->count_active_extensions; n++) {
 			m = wsi->active_extensions[n]->callback(
-				wsi->protocol->owning_server, wsi,
+					wsi->protocol->owning_server,
+					wsi->active_extensions[n], wsi,
 					LWS_EXT_CALLBACK_FLUSH_PENDING_TX,
 				   wsi->active_extensions_user[n], &eff_buf, 0);
 			if (m < 0) {
@@ -285,9 +286,10 @@
 		if (!wsi->active_extensions[n]->callback)
 			continue;
 
-		wsi->active_extensions[n]->callback(context, wsi,
-			LWS_EXT_CALLBACK_DESTROY,
-			wsi->active_extensions_user[n], NULL, 0);
+		wsi->active_extensions[n]->callback(context,
+			wsi->active_extensions[n], wsi,
+				LWS_EXT_CALLBACK_DESTROY,
+				       wsi->active_extensions_user[n], NULL, 0);
 
 		free(wsi->active_extensions_user[n]);
 	}
@@ -539,7 +541,8 @@
 
 		for (n = 0; n < wsi->count_active_extensions; n++) {
 			m = wsi->active_extensions[n]->callback(
-				wsi->protocol->owning_server, wsi,
+				wsi->protocol->owning_server,
+				wsi->active_extensions[n], wsi,
 					LWS_EXT_CALLBACK_PACKET_TX_PRESEND,
 				   wsi->active_extensions_user[n], &eff_buf, 0);
 			if (m < 0) {
@@ -1586,9 +1589,11 @@
 				/* allow him to construct his context */
 
 				ext->callback(wsi->protocol->owning_server,
-					wsi, LWS_EXT_CALLBACK_CLIENT_CONSTRUCT,
+					ext, wsi,
+					   LWS_EXT_CALLBACK_CLIENT_CONSTRUCT,
 						wsi->active_extensions_user[
-					wsi->count_active_extensions], NULL, 0);
+						 wsi->count_active_extensions],
+								       NULL, 0);
 
 				wsi->count_active_extensions++;
 
@@ -1764,9 +1769,11 @@
 			more = 0;
 
 			for (n = 0; n < wsi->count_active_extensions; n++) {
-				m = wsi->active_extensions[n]->callback(context, wsi,
+				m = wsi->active_extensions[n]->callback(context,
+					wsi->active_extensions[n], wsi,
 					LWS_EXT_CALLBACK_PACKET_RX_PREPARSE,
-				     wsi->active_extensions_user[n], &eff_buf, 0);
+					wsi->active_extensions_user[n],
+								   &eff_buf, 0);
 				if (m < 0) {
 					fprintf(stderr, "Extension reports fatal error\n");
 					libwebsocket_close_and_free_session(context, wsi,