[Ante-cvs] SF.net SVN: ante: [492] trunk/ant

[<rog...@us...>]

Revision: 492
          http://ante.svn.sourceforge.net/ante/?rev=492&view=rev
Author:   roguestar191
Date:     2008-03-07 15:25:56 -0800 (Fri, 07 Mar 2008)

Log Message:
-----------
commented 2 lines in httpd.cpp to get shtick working again

Modified Paths:
--------------
    trunk/ant/httpd.cpp
    trunk/ant/mud.cpp
    trunk/ant/socket.cpp
    trunk/ant/socket.h

Modified: trunk/ant/httpd.cpp
===================================================================
--- trunk/ant/httpd.cpp	2007-08-15 06:29:58 UTC (rev 491)
+++ trunk/ant/httpd.cpp	2008-03-07 23:25:56 UTC (rev 492)
@@ -823,9 +823,10 @@
 			closeit = false;
 			getHeader.append(httpHeader(code_out, 0, true, contentheader,&cacheout, &cookiecontent));
 			socket = sock_in; //change the socket so all
-			std::vector<int>::iterator iter = msocket.begin();
-			msocket.push_back((*(iter)));
-			(*(iter))  = sock_in;
+		//	if(msocket.size() == 0) msocket.push_back(sock_in);
+			//std::vector<int>::iterator iter = msocket.begin();
+		//	msocket.push_back((*(iter)));
+		//	(*(iter))  = sock_in;
 			//new prints go to this one by default unless
 			//the request comes from another port
 		} //all print requests without a socket

Modified: trunk/ant/mud.cpp
===================================================================
--- trunk/ant/mud.cpp	2007-08-15 06:29:58 UTC (rev 491)
+++ trunk/ant/mud.cpp	2008-03-07 23:25:56 UTC (rev 492)
@@ -946,6 +946,7 @@
 										remplayer.buf = "fcgi request destruction";
 										//if(remplayer.rem) 
 										datafromall->packets.push_back(remplayer);										//else dend--;
+										//continue; // ?
 						
 									}
 								}
@@ -1636,13 +1637,17 @@
 	}
 	std::vector<object *>::iterator iter;
 	std::string buf2;
+	buf2.reserve(buf->size());
+	for(size_t c = 0, e = buf->size(); c != e; c++) buf2 += (*buf)[c];	
+//std::copy(buf->begin(), buf->end(), buf2.begin());
+//	buf2.append( *buf);
 	if(p_in->myType != TYPE_PLAYER) return;
 //	int sock = p_in->msocket;
-	for(iter = Players.begin(); iter < Players.end(); iter++) {
+	for(iter = Players.begin(); iter != Players.end(); iter++) {
 		if((*(iter)) == p_in) {
 			mob *p = static_cast<mob *>(*(iter));
-			buf2.clear();
-			buf2.append((*(buf)));
+		//	buf2.clear();
+		//	buf2.append((*(buf)));
 			// try sending to web clients{{{
 			if(p->webb) {
 				if(sock_in != 0) {
@@ -1666,11 +1671,11 @@
 				} else if(p->canSend(p->socket)) {
 					try {
 						std::string buf3;
-                        if(p->headersent(p->socket)) {
-                        	buf3.append(colorBuf(&buf2, p));
-                        } else {
-                        	buf3.append(buf2);
-                   	    }
+        	                		if(p->headersent(p->socket)) {
+	                		        	buf3.append(colorBuf(&buf2, p));
+						} else {
+							buf3.append(buf2);
+						}
 						Logger::log1 << "Printed: " << sock_in << " " << buf3;
 						msend(p->socket, buf3.c_str(), buf3.size(), 0);
 						return;
@@ -1690,6 +1695,7 @@
 					return;
 				} catch(...) {
 					Logger::log1 << "Trying to recover from a sigpipe most likely!!\n\r";
+					return;
 				}
 			}
 			// }}}

Modified: trunk/ant/socket.cpp
===================================================================
--- trunk/ant/socket.cpp	2007-08-15 06:29:58 UTC (rev 491)
+++ trunk/ant/socket.cpp	2008-03-07 23:25:56 UTC (rev 492)
@@ -877,7 +877,8 @@
 			pls::APacket foundsome; // {{{
 			foundsome.buf.clear(); //make sure it's clean
 			int x = 0;
-			for(;x < nread; x++) foundsome.buf += buf[x];
+			//for(;x < nread; x++) foundsome.buf += buf[x];
+			foundsome.buf.append(buf, nread);
 			foundsome.socket = fd;
 			foundsome.deleter = false;
 			foundsome.pl = (*(iter)).player;

Modified: trunk/ant/socket.h
===================================================================
--- trunk/ant/socket.h	2007-08-15 06:29:58 UTC (rev 491)
+++ trunk/ant/socket.h	2008-03-07 23:25:56 UTC (rev 492)
@@ -25,40 +25,40 @@
 class mob;
 class FastCGIPacket;
 class pls {
-	public:
-		class APacket {
-			public:
-			APacket(){socket = 0; deleter = false; buf.erase(); pl = NULL;fpack = NULL;rem=false;rmplayer = NULL;};
-			~APacket(){};
-			APacket(const APacket &in) {
-				socket = in.socket;
-				deleter = in.deleter;
-				if(in.buf.size() > 0)
-					buf = in.buf;
-				pl = in.pl;
-				fpack = in.fpack;
-				rem = in.rem;
-				rmplayer = in.rmplayer;
-			}
-			std::string buf;
-			int socket;
-			bool deleter;
-			mob *pl;
-			mob *rmplayer;
-			FastCGIPacket *fpack;
-			bool rem;
-		};
-		std::vector<APacket> packets;
-		pls() {};
-		~pls() {for(std::vector<APacket>::iterator iter = packets.begin();
-			iter < packets.end(); iter = packets.begin()) {
-				packets.erase(iter);
-			}};
-		pls(const pls &in) {
-			for(std::vector<APacket>::const_iterator iter = in.packets.begin(); iter < in.packets.end(); iter++) {
-				packets.push_back((*(iter)));
-			}
-		};
+public:
+	class APacket {
+		public:
+		APacket(){socket = 0; deleter = false; buf.erase(); pl = NULL;fpack = NULL;rem=false;rmplayer = NULL;};
+		~APacket(){};
+		APacket(const APacket &in) {
+			socket = in.socket;
+			deleter = in.deleter;
+			if(in.buf.size() > 0)
+				buf = in.buf;
+			pl = in.pl;
+			fpack = in.fpack;
+			rem = in.rem;
+			rmplayer = in.rmplayer;
+		}
+		std::string buf;
+		int socket;
+		bool deleter;
+		mob *pl;
+		mob *rmplayer;
+		FastCGIPacket *fpack;
+		bool rem;
+	};
+	std::vector<APacket> packets;
+	pls() {};
+	~pls() {for(std::vector<APacket>::iterator iter = packets.begin();
+		iter < packets.end(); iter = packets.begin()) {
+			packets.erase(iter);
+		}};
+	pls(const pls &in) {
+		for(std::vector<APacket>::const_iterator iter = in.packets.begin(); iter < in.packets.end(); iter++) {
+			packets.push_back((*(iter)));
+		}
+	};
 };
 extern int defaultBufSiz;
 struct isSOpen {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.