author | mickeyl <mickeyl> | 2003-12-15 15:16:26 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-15 15:16:26 (UTC) |
commit | 4acec249d48e57c911fc2544d92785b86d5f08d0 (patch) (unidiff) | |
tree | b1613124a5093d420cdbfba4a46b9edbf8db1712 /noncore | |
parent | 7fa223e6851a0436d7ac010117d9d31fd0444cbd (diff) | |
download | opie-4acec249d48e57c911fc2544d92785b86d5f08d0.zip opie-4acec249d48e57c911fc2544d92785b86d5f08d0.tar.gz opie-4acec249d48e57c911fc2544d92785b86d5f08d0.tar.bz2 |
use current dumpname, not always /var/log/...
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 322 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 13 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 |
4 files changed, 179 insertions, 159 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 4fc8ea1..2c335df 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui | |||
@@ -11,8 +11,8 @@ | |||
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>286</width> | 14 | <width>303</width> |
15 | <height>345</height> | 15 | <height>343</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
@@ -59,7 +59,7 @@ | |||
59 | <vbox> | 59 | <vbox> |
60 | <property stdset="1"> | 60 | <property stdset="1"> |
61 | <name>margin</name> | 61 | <name>margin</name> |
62 | <number>11</number> | 62 | <number>6</number> |
63 | </property> | 63 | </property> |
64 | <property stdset="1"> | 64 | <property stdset="1"> |
65 | <name>spacing</name> | 65 | <name>spacing</name> |
@@ -706,7 +706,7 @@ | |||
706 | <vbox> | 706 | <vbox> |
707 | <property stdset="1"> | 707 | <property stdset="1"> |
708 | <name>margin</name> | 708 | <name>margin</name> |
709 | <number>11</number> | 709 | <number>6</number> |
710 | </property> | 710 | </property> |
711 | <property stdset="1"> | 711 | <property stdset="1"> |
712 | <name>spacing</name> | 712 | <name>spacing</name> |
@@ -773,6 +773,10 @@ | |||
773 | <cstring>GroupBox4_2</cstring> | 773 | <cstring>GroupBox4_2</cstring> |
774 | </property> | 774 | </property> |
775 | <property stdset="1"> | 775 | <property stdset="1"> |
776 | <name>enabled</name> | ||
777 | <bool>false</bool> | ||
778 | </property> | ||
779 | <property stdset="1"> | ||
776 | <name>title</name> | 780 | <name>title</name> |
777 | <string>Action On Detecting</string> | 781 | <string>Action On Detecting</string> |
778 | </property> | 782 | </property> |
@@ -856,7 +860,7 @@ | |||
856 | <grid> | 860 | <grid> |
857 | <property stdset="1"> | 861 | <property stdset="1"> |
858 | <name>margin</name> | 862 | <name>margin</name> |
859 | <number>11</number> | 863 | <number>6</number> |
860 | </property> | 864 | </property> |
861 | <property stdset="1"> | 865 | <property stdset="1"> |
862 | <name>spacing</name> | 866 | <name>spacing</name> |
@@ -1066,166 +1070,178 @@ | |||
1066 | <name>title</name> | 1070 | <name>title</name> |
1067 | <string>GPS</string> | 1071 | <string>GPS</string> |
1068 | </attribute> | 1072 | </attribute> |
1069 | <widget> | 1073 | <grid> |
1070 | <class>QLayoutWidget</class> | ||
1071 | <property stdset="1"> | 1074 | <property stdset="1"> |
1072 | <name>name</name> | 1075 | <name>margin</name> |
1073 | <cstring>Layout1</cstring> | 1076 | <number>5</number> |
1074 | </property> | 1077 | </property> |
1075 | <property stdset="1"> | 1078 | <property stdset="1"> |
1076 | <name>geometry</name> | 1079 | <name>spacing</name> |
1077 | <rect> | 1080 | <number>4</number> |
1078 | <x>10</x> | ||
1079 | <y>40</y> | ||
1080 | <width>216</width> | ||
1081 | <height>27</height> | ||
1082 | </rect> | ||
1083 | </property> | 1081 | </property> |
1084 | <hbox> | 1082 | <widget row="0" column="0" > |
1085 | <property stdset="1"> | 1083 | <class>QLayoutWidget</class> |
1086 | <name>margin</name> | ||
1087 | <number>0</number> | ||
1088 | </property> | ||
1089 | <property stdset="1"> | 1084 | <property stdset="1"> |
1090 | <name>spacing</name> | 1085 | <name>name</name> |
1091 | <number>6</number> | 1086 | <cstring>Layout6</cstring> |
1092 | </property> | 1087 | </property> |
1093 | <widget> | 1088 | <vbox> |
1094 | <class>QLabel</class> | ||
1095 | <property stdset="1"> | 1089 | <property stdset="1"> |
1096 | <name>name</name> | 1090 | <name>margin</name> |
1097 | <cstring>TextLabel1_4</cstring> | 1091 | <number>0</number> |
1098 | </property> | 1092 | </property> |
1099 | <property stdset="1"> | 1093 | <property stdset="1"> |
1100 | <name>text</name> | 1094 | <name>spacing</name> |
1101 | <string>Host</string> | 1095 | <number>6</number> |
1102 | </property> | 1096 | </property> |
1103 | </widget> | 1097 | <widget> |
1104 | <widget> | 1098 | <class>QCheckBox</class> |
1105 | <class>QComboBox</class> | 1099 | <property stdset="1"> |
1106 | <item> | 1100 | <name>name</name> |
1107 | <property> | 1101 | <cstring>enableGPS</cstring> |
1102 | </property> | ||
1103 | <property stdset="1"> | ||
1108 | <name>text</name> | 1104 | <name>text</name> |
1109 | <string>localhost</string> | 1105 | <string>Enable GPS logging w/ gpsd</string> |
1110 | </property> | 1106 | </property> |
1111 | </item> | 1107 | </widget> |
1112 | <property stdset="1"> | 1108 | <widget> |
1113 | <name>name</name> | 1109 | <class>QLayoutWidget</class> |
1114 | <cstring>gpsdHost</cstring> | 1110 | <property stdset="1"> |
1115 | </property> | 1111 | <name>name</name> |
1116 | <property stdset="1"> | 1112 | <cstring>Layout1</cstring> |
1117 | <name>enabled</name> | 1113 | </property> |
1118 | <bool>false</bool> | 1114 | <hbox> |
1119 | </property> | 1115 | <property stdset="1"> |
1120 | <property stdset="1"> | 1116 | <name>margin</name> |
1121 | <name>editable</name> | 1117 | <number>0</number> |
1122 | <bool>true</bool> | 1118 | </property> |
1123 | </property> | 1119 | <property stdset="1"> |
1124 | <property stdset="1"> | 1120 | <name>spacing</name> |
1125 | <name>currentItem</name> | 1121 | <number>6</number> |
1126 | <number>0</number> | 1122 | </property> |
1127 | </property> | 1123 | <widget> |
1128 | </widget> | 1124 | <class>QLabel</class> |
1129 | <widget> | 1125 | <property stdset="1"> |
1130 | <class>QLabel</class> | 1126 | <name>name</name> |
1131 | <property stdset="1"> | 1127 | <cstring>TextLabel1_4</cstring> |
1132 | <name>name</name> | 1128 | </property> |
1133 | <cstring>TextLabel2_2</cstring> | 1129 | <property stdset="1"> |
1134 | </property> | 1130 | <name>text</name> |
1135 | <property stdset="1"> | 1131 | <string>Host</string> |
1136 | <name>text</name> | 1132 | </property> |
1137 | <string>:</string> | 1133 | </widget> |
1138 | </property> | 1134 | <widget> |
1139 | </widget> | 1135 | <class>QComboBox</class> |
1140 | <widget> | 1136 | <item> |
1141 | <class>QSpinBox</class> | 1137 | <property> |
1142 | <property stdset="1"> | 1138 | <name>text</name> |
1143 | <name>name</name> | 1139 | <string>localhost</string> |
1144 | <cstring>gpsdPort</cstring> | 1140 | </property> |
1145 | </property> | 1141 | </item> |
1146 | <property stdset="1"> | 1142 | <property stdset="1"> |
1147 | <name>enabled</name> | 1143 | <name>name</name> |
1148 | <bool>false</bool> | 1144 | <cstring>gpsdHost</cstring> |
1149 | </property> | 1145 | </property> |
1150 | <property stdset="1"> | 1146 | <property stdset="1"> |
1151 | <name>maxValue</name> | 1147 | <name>enabled</name> |
1152 | <number>65535</number> | 1148 | <bool>false</bool> |
1153 | </property> | 1149 | </property> |
1154 | <property stdset="1"> | 1150 | <property stdset="1"> |
1155 | <name>minValue</name> | 1151 | <name>editable</name> |
1156 | <number>1024</number> | 1152 | <bool>true</bool> |
1157 | </property> | 1153 | </property> |
1158 | <property stdset="1"> | 1154 | <property stdset="1"> |
1159 | <name>value</name> | 1155 | <name>currentItem</name> |
1160 | <number>2947</number> | 1156 | <number>0</number> |
1161 | </property> | 1157 | </property> |
1162 | </widget> | 1158 | </widget> |
1163 | </hbox> | 1159 | <widget> |
1164 | </widget> | 1160 | <class>QLabel</class> |
1165 | <widget> | 1161 | <property stdset="1"> |
1166 | <class>QLineEdit</class> | 1162 | <name>name</name> |
1167 | <property stdset="1"> | 1163 | <cstring>TextLabel2_2</cstring> |
1168 | <name>name</name> | 1164 | </property> |
1169 | <cstring>commandGPS</cstring> | 1165 | <property stdset="1"> |
1170 | </property> | 1166 | <name>text</name> |
1171 | <property stdset="1"> | 1167 | <string>:</string> |
1172 | <name>enabled</name> | 1168 | </property> |
1173 | <bool>false</bool> | 1169 | </widget> |
1174 | </property> | 1170 | <widget> |
1175 | <property stdset="1"> | 1171 | <class>QSpinBox</class> |
1176 | <name>geometry</name> | 1172 | <property stdset="1"> |
1177 | <rect> | 1173 | <name>name</name> |
1178 | <x>10</x> | 1174 | <cstring>gpsdPort</cstring> |
1179 | <y>110</y> | 1175 | </property> |
1180 | <width>210</width> | 1176 | <property stdset="1"> |
1181 | <height>22</height> | 1177 | <name>enabled</name> |
1182 | </rect> | 1178 | <bool>false</bool> |
1183 | </property> | 1179 | </property> |
1184 | <property stdset="1"> | 1180 | <property stdset="1"> |
1185 | <name>text</name> | 1181 | <name>maxValue</name> |
1186 | <string>gpsd -p /dev/ttyS3 -s 57600</string> | 1182 | <number>65535</number> |
1187 | </property> | 1183 | </property> |
1188 | </widget> | 1184 | <property stdset="1"> |
1189 | <widget> | 1185 | <name>minValue</name> |
1190 | <class>QCheckBox</class> | 1186 | <number>1024</number> |
1191 | <property stdset="1"> | 1187 | </property> |
1192 | <name>name</name> | 1188 | <property stdset="1"> |
1193 | <cstring>enableGPS</cstring> | 1189 | <name>value</name> |
1194 | </property> | 1190 | <number>2947</number> |
1195 | <property stdset="1"> | 1191 | </property> |
1196 | <name>geometry</name> | 1192 | </widget> |
1197 | <rect> | 1193 | </hbox> |
1198 | <x>10</x> | 1194 | </widget> |
1199 | <y>10</y> | 1195 | <widget> |
1200 | <width>199</width> | 1196 | <class>QCheckBox</class> |
1201 | <height>21</height> | 1197 | <property stdset="1"> |
1202 | </rect> | 1198 | <name>name</name> |
1203 | </property> | 1199 | <cstring>startGPS</cstring> |
1204 | <property stdset="1"> | 1200 | </property> |
1205 | <name>text</name> | 1201 | <property stdset="1"> |
1206 | <string>Enable GPS logging w/ gpsd</string> | 1202 | <name>text</name> |
1207 | </property> | 1203 | <string>Start gpsd on localhost</string> |
1208 | </widget> | 1204 | </property> |
1209 | <widget> | 1205 | </widget> |
1210 | <class>QCheckBox</class> | 1206 | <widget> |
1211 | <property stdset="1"> | 1207 | <class>QLineEdit</class> |
1212 | <name>name</name> | 1208 | <property stdset="1"> |
1213 | <cstring>startGPS</cstring> | 1209 | <name>name</name> |
1214 | </property> | 1210 | <cstring>commandGPS</cstring> |
1215 | <property stdset="1"> | 1211 | </property> |
1216 | <name>geometry</name> | 1212 | <property stdset="1"> |
1217 | <rect> | 1213 | <name>enabled</name> |
1218 | <x>10</x> | 1214 | <bool>false</bool> |
1219 | <y>80</y> | 1215 | </property> |
1220 | <width>171</width> | 1216 | <property stdset="1"> |
1221 | <height>21</height> | 1217 | <name>text</name> |
1222 | </rect> | 1218 | <string>gpsd -p /dev/ttyS3 -s 57600</string> |
1223 | </property> | 1219 | </property> |
1224 | <property stdset="1"> | 1220 | </widget> |
1225 | <name>text</name> | 1221 | <spacer> |
1226 | <string>Start gpsd on localhost</string> | 1222 | <property> |
1227 | </property> | 1223 | <name>name</name> |
1228 | </widget> | 1224 | <cstring>Spacer4_2</cstring> |
1225 | </property> | ||
1226 | <property stdset="1"> | ||
1227 | <name>orientation</name> | ||
1228 | <enum>Vertical</enum> | ||
1229 | </property> | ||
1230 | <property stdset="1"> | ||
1231 | <name>sizeType</name> | ||
1232 | <enum>Expanding</enum> | ||
1233 | </property> | ||
1234 | <property> | ||
1235 | <name>sizeHint</name> | ||
1236 | <size> | ||
1237 | <width>20</width> | ||
1238 | <height>20</height> | ||
1239 | </size> | ||
1240 | </property> | ||
1241 | </spacer> | ||
1242 | </vbox> | ||
1243 | </widget> | ||
1244 | </grid> | ||
1229 | </widget> | 1245 | </widget> |
1230 | </widget> | 1246 | </widget> |
1231 | </grid> | 1247 | </grid> |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index bb46dd7..ca9851c 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -422,16 +422,18 @@ void WellenreiterMainWindow::uploadSession() | |||
422 | rhost_info = (struct hostent *) ::gethostbyname( CAP_hostname ); | 422 | rhost_info = (struct hostent *) ::gethostbyname( CAP_hostname ); |
423 | if ( rhost_info ) | 423 | if ( rhost_info ) |
424 | { | 424 | { |
425 | if ( !QFile::exists( "/var/log/dump.wellenreiter" ) ) | 425 | |
426 | |||
427 | if ( !QFile::exists( mw->captureFileName() ) ) | ||
426 | { | 428 | { |
427 | QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Logfile doesn't exist</p>") ); | 429 | QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Logfile '%1' doesn't exist</p>").arg( mw->captureFileName() ) ); |
428 | return; | 430 | return; |
429 | } | 431 | } |
430 | 432 | ||
431 | QFile f( "/var/log/dump.wellenreiter" ); | 433 | QFile f( mw->captureFileName() ); |
432 | if ( !f.open( IO_ReadOnly ) ) | 434 | if ( !f.open( IO_ReadOnly ) ) |
433 | { | 435 | { |
434 | QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Can't open Logfile</p>") ); | 436 | QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Can't open Logfile '%1'</p>").arg( mw->captureFileName() ) ); |
435 | return; | 437 | return; |
436 | } | 438 | } |
437 | 439 | ||
@@ -481,7 +483,7 @@ void WellenreiterMainWindow::uploadSession() | |||
481 | "\r\n" | 483 | "\r\n" |
482 | "%3\r\n" | 484 | "%3\r\n" |
483 | "-----------------------------97267758015830030481215568065\r\n" | 485 | "-----------------------------97267758015830030481215568065\r\n" |
484 | "Content-Disposition: form-data; name=\"upfile\"; filename=\"/var/log/dump.wellenreiter\"\r\n" | 486 | "Content-Disposition: form-data; name=\"upfile\"; filename=\"%4\"\r\n" |
485 | "Content-Type: application/octet-stream\r\n" | 487 | "Content-Type: application/octet-stream\r\n" |
486 | "\r\n"; | 488 | "\r\n"; |
487 | 489 | ||
@@ -491,6 +493,7 @@ void WellenreiterMainWindow::uploadSession() | |||
491 | content = content.arg( from->text().isEmpty() ? QString( "Anonymous Wellenreiter II User" ) : from->text() ); | 493 | content = content.arg( from->text().isEmpty() ? QString( "Anonymous Wellenreiter II User" ) : from->text() ); |
492 | content = content.arg( location->text().isEmpty() ? QString( "Anonymous Wellenreiter II Location" ) : location->text() ); | 494 | content = content.arg( location->text().isEmpty() ? QString( "Anonymous Wellenreiter II Location" ) : location->text() ); |
493 | content = content.arg( comments->text().isEmpty() ? QString( "Anonymous Wellenreiter II Comments" ) : comments->text() ); | 495 | content = content.arg( comments->text().isEmpty() ? QString( "Anonymous Wellenreiter II Comments" ) : comments->text() ); |
496 | content = content.arg( mw->captureFileName() ); | ||
494 | 497 | ||
495 | header = header.arg( QString::number( content.length() + f.size() + preambel.length() ) ); | 498 | header = header.arg( QString::number( content.length() + f.size() + preambel.length() ) ); |
496 | 499 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index ec89f1e..9255a6d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -507,7 +507,6 @@ void Wellenreiter::startClicked() | |||
507 | 507 | ||
508 | // open pcap and start sniffing | 508 | // open pcap and start sniffing |
509 | 509 | ||
510 | QString dumpname; | ||
511 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? | 510 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? |
512 | { | 511 | { |
513 | dumpname = configwindow->captureFileName->text(); | 512 | dumpname = configwindow->captureFileName->text(); |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index d882500..58dd1fd 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -51,6 +51,7 @@ class Wellenreiter : public WellenreiterBase { | |||
51 | MLogWindow* logWindow() const { return logwindow; }; | 51 | MLogWindow* logWindow() const { return logwindow; }; |
52 | MHexWindow* hexWindow() const { return hexwindow; }; | 52 | MHexWindow* hexWindow() const { return hexwindow; }; |
53 | bool isDaemonRunning() const { return sniffing; }; | 53 | bool isDaemonRunning() const { return sniffing; }; |
54 | QString captureFileName() const { return dumpname; }; | ||
54 | 55 | ||
55 | public: | 56 | public: |
56 | bool sniffing; | 57 | bool sniffing; |
@@ -88,6 +89,7 @@ class Wellenreiter : public WellenreiterBase { | |||
88 | OSystem _system; // Opie Operating System identifier | 89 | OSystem _system; // Opie Operating System identifier |
89 | #endif | 90 | #endif |
90 | 91 | ||
92 | QString dumpname; | ||
91 | OWirelessNetworkInterface* iface; | 93 | OWirelessNetworkInterface* iface; |
92 | OPacketCapturer* pcap; | 94 | OPacketCapturer* pcap; |
93 | WellenreiterConfigWindow* configwindow; | 95 | WellenreiterConfigWindow* configwindow; |