gcc33 + sms i sniffit - patche

[Pawel Nogas]

Przygotowalem poprawki do sniffit i sms dla gcc3.3 - bylbym wdzieczny gdyby 
ktos to wrzucil.

Pod gcc33 nie kompiluje sie takze dsniff i libnids

P.


--- sniffit.0.3.7.beta/sn_structs.h~	Thu Jul 16 18:17:10 1998
+++ sniffit.0.3.7.beta/sn_structs.h	Sat Jun  7 16:32:29 2003
@@ -67,7 +67,7 @@
 struct snif_mask                                         /* struct for mask 
*/
   {
   _32_bit source_ip, destination_ip;
-  _32_bit short source_port, destination_port;
+  unsigned short source_port, destination_port;
   };
 
 /* (packet generation) */




--- sms.spec~	Fri Jun  6 16:16:36 2003
+++ sms.spec	Sat Jun  7 20:03:19 2003
@@ -11,6 +11,7 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	smsq
+Patch0:		%{name}-gcc33.patch
 URL:		http://ceti.pl/~miki/komputery/sms.html
 BuildRequires:	gdbm-devel
 BuildRequires:	libstdc++-devel
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 %build
 %{__make} \



--- sms/bramka.cc~	Mon Dec  2 09:44:18 2002
+++ sms/bramka.cc	Sat Jun  7 17:03:21 2003
@@ -5,7 +5,7 @@
  * 29.11.2002, Piotr Godowski, <flash w v-lo.krakow.pl>
  */
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/czat.cc~	Mon Dec  2 09:44:18 2002
+++ sms/czat.cc		Sat Jun  7 17:03:39 2003
@@ -3,7 +3,7 @@
  * Wysyla sms'a poprzez bramke Idea.czat
  */
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/debug.h~	Sun Jun  1 23:28:31 2003
+++ sms/debug.h	Sat Jun  7 17:58:14 2003
@@ -1,7 +1,7 @@
 #ifndef __debug_h
 #define __debug_h
 
-#include <fstream.h>
+#include <fstream>
 
 #define LOG_FILE "sms.log"
 #define MAX_LOG_LINE_LEN 32768
@@ -11,7 +11,7 @@
 
 class Debug
 {
-      ofstream *str;
+      std::ofstream *str;
       char *name;
 
       void Open();
--- sms/era.cc~	Mon Jun  2 00:12:52 2003
+++ sms/era.cc	Sat Jun  7 17:03:57 2003
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/freesms.cc~	Mon Dec  2 09:44:18 2002
+++ sms/freesms.cc	Sat Jun  7 17:04:36 2003
@@ -6,7 +6,7 @@
 *****************************************************************/
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/hulp.cc~	Mon Jun  2 00:12:33 2003
+++ sms/hulp.cc	Sat Jun  7 17:04:27 2003
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/pf.cc~	Mon Dec  2 09:44:45 2002
+++ sms/pf.cc	Sat Jun  7 17:05:20 2003
@@ -10,7 +10,7 @@
 */
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/request.cc~	Mon Jun  2 00:17:35 2003
+++ sms/request.cc	Sat Jun  7 18:05:50 2003
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <strstream.h>
-#include <iostream.h>
+#include <sstream>
+#include <iostream>
 #include "socket.h"
 #include "request.h"
 #include "sms.h"
@@ -171,7 +171,6 @@
     delete buf;
     return ret_buf; 
 }
-
 void HTTP_Request::ParseHeaders(Headers &hd, const char *buf, int buf_len)
 {
     // pierwsza linijka zawiera tekst: HTTP/1.1 200 OK
@@ -179,7 +178,7 @@
     // konczone sa dodatkowo znakiem \r (powrot karetki)
 
     char *line = new char[MAX_LINE_LEN], *c;
-    istrstream is(buf, buf_len);
+    std::istringstream is(buf);
     
     // najpierw linia ze statusem operacji
     is.getline(line, MAX_LINE_LEN);
--- sms/smsc.cc~	Sat Dec 28 18:59:17 2002
+++ sms/smsc.cc	Sat Jun  7 17:05:47 2003
@@ -5,7 +5,7 @@
  * 17.12.2002, Piotr Godowski, <flash w v-lo.krakow.pl>
  */
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include "request.h"
 #include "headers.h"
 #include "sms.h"
--- sms/supersms.cc~	Sat Dec 28 18:26:45 2002
+++ sms/supersms.cc	Sat Jun  7 17:05:57 2003
@@ -7,7 +7,7 @@
 *****************************************************************/
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <ctype.h>
 #include "request.h"
--- sms/main.cc~	Mon Jun  2 00:18:39 2003
+++ sms/main.cc	Sat Jun  7 22:15:35 2003
@@ -9,8 +9,8 @@
 #include <signal.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <sstream>
 #include <string>
 #include "vsprintf.h"
 #include "headers.h"
@@ -290,18 +290,12 @@
 
 	if (start_arg >= argc) {
 		// pobieramy ze stdin
-		strstream s;
-		char *n;
-		int len;
+		std::stringstream s;
+		string msg;
 
 		cin >> s.rdbuf();
-		len = s.pcount();
-		n = s.str();
-		strncpy(args.sms, (n) ? n : "", sizeof(args.sms)-1);
-		if (len < sizeof(args.sms)) {
-			args.sms[len] = 0;
-		}
-		s.freeze(0);
+		msg = s.str();
+		strncpy(args.sms, msg.c_str(), sizeof(args.sms)-1);
 	} else {
 		// pobieramy z linii polecen
 		string msg;
--- sms/debug.cc~	Sat Dec 28 17:35:42 2002
+++ sms/debug.cc	Sat Jun  7 21:51:56 2003
@@ -20,7 +20,7 @@
 void Debug::Open()
 {
 #ifdef DEBUG
-     if (!str) str = new ofstream(name);
+     if (!str) str = new std::ofstream(name);
 #endif
 }
 
@@ -31,7 +31,7 @@
     
     char buf[MAX_LOG_LINE_LEN];
     va_list args;
-    ofstream &stream = *str;
+    std::ofstream &stream = *str;
 
     va_start(args, msg);
     VSPRINTF(buf, sizeof(buf)-1, msg, args);