r2695 - in trunk: libminisip/source/zrtp minisip/minisip/gui/gtkgui

[werner at minisip.org]

Author: werner
Date: 2006-07-09 16:54:28 +0200 (Sun, 09 Jul 2006)
New Revision: 2695

Modified:
   trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx
   trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx
   trunk/minisip/minisip/gui/gtkgui/CallWidget.h
Log:
Another step for ZRTP integration. If the
connection is secure using ZRTP the SAS value is shown

Modified: trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx
===================================================================
--- trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx	2006-07-09 13:18:35 UTC (rev 2694)
+++ trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx	2006-07-09 14:54:28 UTC (rev 2695)
@@ -223,12 +223,12 @@
         // roc << 16 | seqNo
         cryptoContext->derive_srtp_keys( sStream->getSeqNo() );   // TODO check this
         rStream->setKeyAgreementZrtp(cryptoContext);
-        snprintf(buffer, 120, "SAS Value(R): %s\n", secrets->sas.c_str());
+        snprintf(buffer, 120, "SAS Value: %s\n", secrets->sas.c_str());
         sendInfo(Info, buffer);
         secureParts += (int32_t)ForReceiver;
     }
     if (secureParts == ForSender+ForReceiver) {
-        CommandString cmd(callId, "zrtp_security_change", "secure");
+        CommandString cmd(callId, "zrtp_security_change", "secure", secrets->sas);
         messageRouterCallback->handleCommand("gui", cmd);
     }
 }

Modified: trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx	2006-07-09 13:18:35 UTC (rev 2694)
+++ trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx	2006-07-09 14:54:28 UTC (rev 2695)
@@ -84,7 +84,7 @@
 	
 	rightTopBox->pack_start( status, false, false, 5 );
 	rightTopBox->pack_start( secStatus, false, false, 5 );
-	
+        rightTopBox->pack_start( sasData, false, false, 5 );
 	pack_start( *topBox, false, false, 5 );
 
 	Pango::AttrList attrList( "<big><b></b></big>" );
@@ -488,7 +488,7 @@
                 if( command.getOp() == "zrtp_security_change") {
                     secStatus.set_markup( "The call is <b>" + 
                             command.getParam() + "</b>" );
-
+                    sasData.set_text("SAS: " + command.getParam2());
                     if( command.getParam() == "secure" ){
                         secureImage.set( Gtk::StockID( "minisip_secure") , Gtk::ICON_SIZE_DIALOG );
                     }

Modified: trunk/minisip/minisip/gui/gtkgui/CallWidget.h
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/CallWidget.h	2006-07-09 13:18:35 UTC (rev 2694)
+++ trunk/minisip/minisip/gui/gtkgui/CallWidget.h	2006-07-09 14:54:28 UTC (rev 2695)
@@ -125,6 +125,9 @@
 		//Gtk::VBox vBox;
 		Gtk::Label status;
 		Gtk::Label secStatus;
+
+                Gtk::Label sasData;
+
 		Gtk::HBox buttonBox;
 #ifndef OLDLIBGLADEMM
 		Gtk::Expander dtmfArrow;