use current dumpname, not always /var/log/...

4 files changed, 79 insertions, 59 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
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>286</width>
-            <height>345</height>
+            <width>303</width>
+            <height>343</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -58,9 +58,9 @@
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>11</number>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
@@ -705,9 +705,9 @@
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>11</number>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
@@ -772,8 +772,12 @@
                             <name>name</name>
                             <cstring>GroupBox4_2</cstring>
                         </property>
                         <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
                             <name>title</name>
                             <string>Action On Detecting</string>
                         </property>
                         <grid>
@@ -855,9 +859,9 @@
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>11</number>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
@@ -1065,22 +1069,48 @@
                 <attribute>
                     <name>title</name>
                     <string>GPS</string>
                 </attribute>
-                <widget>
+                <grid>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>5</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>4</number>
+                    </property>
+                    <widget row="0"  column="0" >
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout1</cstring>
+                            <cstring>Layout6</cstring>
                     </property>
+                        <vbox>
                     <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>10</x>
-                            <y>40</y>
-                            <width>216</width>
-                            <height>27</height>
-                        </rect>
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QCheckBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>enableGPS</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Enable GPS logging w/ gpsd</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout1</cstring>
                     </property>
                     <hbox>
                         <property stdset="1">
                             <name>margin</name>
@@ -1162,71 +1192,57 @@
                         </widget>
                     </hbox>
                 </widget>
                 <widget>
-                    <class>QLineEdit</class>
+                                <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>commandGPS</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
-                    </property>
-                    <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>10</x>
-                            <y>110</y>
-                            <width>210</width>
-                            <height>22</height>
-                        </rect>
+                                    <cstring>startGPS</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>gpsd -p /dev/ttyS3 -s 57600</string>
+                                    <string>Start gpsd on localhost</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QCheckBox</class>
+                                <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>enableGPS</cstring>
+                                    <cstring>commandGPS</cstring>
                     </property>
                     <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>10</x>
-                            <y>10</y>
-                            <width>199</width>
-                            <height>21</height>
-                        </rect>
+                                    <name>enabled</name>
+                                    <bool>false</bool>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Enable GPS logging w/ gpsd</string>
+                                    <string>gpsd -p /dev/ttyS3 -s 57600</string>
                     </property>
                 </widget>
-                <widget>
-                    <class>QCheckBox</class>
-                    <property stdset="1">
+                            <spacer>
+                                <property>
                         <name>name</name>
-                        <cstring>startGPS</cstring>
+                                    <cstring>Spacer4_2</cstring>
                     </property>
                     <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>10</x>
-                            <y>80</y>
-                            <width>171</width>
-                            <height>21</height>
-                        </rect>
+                                    <name>orientation</name>
+                                    <enum>Vertical</enum>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Start gpsd on localhost</string>
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
                     </property>
+                            </spacer>
+                        </vbox>
                 </widget>
+                </grid>
             </widget>
         </widget>
     </grid>
 </widget>
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
@@ -421,18 +421,20 @@ void WellenreiterMainWindow::uploadSession()
 
     rhost_info = (struct hostent *) ::gethostbyname( CAP_hostname );
     if ( rhost_info )
     {
-        if ( !QFile::exists( "/var/log/dump.wellenreiter" ) )
+
+
+        if ( !QFile::exists( mw->captureFileName() ) )
         {
-            QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Logfile doesn't exist</p>") );
+            QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Logfile '%1' doesn't exist</p>").arg( mw->captureFileName() ) );
             return;
         }
 
-        QFile f( "/var/log/dump.wellenreiter" );
+        QFile f( mw->captureFileName() );
         if ( !f.open( IO_ReadOnly ) )
         {
-            QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Can't open Logfile</p>") );
+            QMessageBox::warning( 0, tr( "Error" ), tr( "<p>Can't open Logfile '%1'</p>").arg( mw->captureFileName() ) );
             return;
         }
 
         int content_length = f.size();
@@ -480,9 +482,9 @@ void WellenreiterMainWindow::uploadSession()
                 "Content-Disposition: form-data; name=\"Comments\"\r\n"
                 "\r\n"
                 "%3\r\n"
                 "-----------------------------97267758015830030481215568065\r\n"
-                "Content-Disposition: form-data; name=\"upfile\"; filename=\"/var/log/dump.wellenreiter\"\r\n"
+                "Content-Disposition: form-data; name=\"upfile\"; filename=\"%4\"\r\n"
                 "Content-Type: application/octet-stream\r\n"
                 "\r\n";
 
                 preambel = ""
@@ -490,8 +492,9 @@ void WellenreiterMainWindow::uploadSession()
 
                 content = content.arg( from->text().isEmpty() ? QString( "Anonymous Wellenreiter II User" ) : from->text() );
                 content = content.arg( location->text().isEmpty() ? QString( "Anonymous Wellenreiter II Location" ) : location->text() );
                 content = content.arg( comments->text().isEmpty() ? QString( "Anonymous Wellenreiter II Comments" ) : comments->text() );
+                content = content.arg( mw->captureFileName() );
 
                 header = header.arg( QString::number( content.length() + f.size() + preambel.length() ) );
 
                 // write header
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
@@ -506,9 +506,8 @@ void Wellenreiter::startClicked()
     }
 
     // open pcap and start sniffing
 
-    QString dumpname;
     if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file?
     {
         dumpname = configwindow->captureFileName->text();
         if ( dumpname.isEmpty() ) dumpname = "captureFile";
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
@@ -50,8 +50,9 @@ class Wellenreiter : public WellenreiterBase {
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
     MHexWindow* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
+    QString captureFileName() const { return dumpname; };
 
   public:
     bool sniffing;
 
@@ -87,8 +88,9 @@ class Wellenreiter : public WellenreiterBase {
     #ifdef QWS
     OSystem _system;                // Opie Operating System identifier
     #endif
 
+    QString dumpname;
     OWirelessNetworkInterface* iface;
     OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
     GPS* gps;