Changeset 12852

Timestamp:

10/26/11 14:48:57 (19 months ago)

Author:

robert

Message:

Added password support into present3D's vnc support via the tag usage : <vnc password="mypassword">hostname</vnc>

Location:

OpenSceneGraph/trunk

Files:

• applications/present3D/present3D.cpp (modified) (1 diff)
• include/osgPresentation/SlideShowConstructor (modified) (1 diff)
• src/osgPlugins/p3d/ReaderWriterP3D.cpp (modified) (1 diff)
• src/osgPresentation/SlideShowConstructor.cpp (modified) (1 diff)

OpenSceneGraph/trunk/applications/present3D/present3D.cpp

@@ -443 +443 @@
     }
 
+    // set up any logins required for http access
+    std::string url, username, password;
+    while(arguments.read("--login",url, username, password))
+    {
+        if (!osgDB::Registry::instance()->getAuthenticationMap())
+        {
+            osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
+            osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
+                url,
+                new osgDB::AuthenticationDetails(username, password)
+            );
+        }
+    }
+
+
 
 #ifdef USE_SDL

OpenSceneGraph/trunk/include/osgPresentation/SlideShowConstructor

@@ -395 +395 @@
 
     void addGraph(const std::string& filename,const std::string& options,const PositionData& positionData, const ImageData& imageData);
-    void addVNC(const std::string& filename,const PositionData& positionData, const ImageData& imageData);
+    void addVNC(const std::string& filename,const PositionData& positionData, const ImageData& imageData, const std::string& password);
     void addBrowser(const std::string& filename,const PositionData& positionData, const ImageData& imageData);
     void addPDF(const std::string& filename,const PositionData& positionData, const ImageData& imageData);

OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp

@@ -1314 +1314 @@
             getProperties(cur,imageData);
 
+            std::string password;
+            getProperty(cur, "password", password);
+
             constructor.addVNC(cur->getTrimmedContents(),
                                     positionRead ? positionData : constructor.getImagePositionData(),
-                                    imageData);
+                                    imageData,
+                                    password
+                              );
         }
         else if (cur->name == "browser")

OpenSceneGraph/trunk/src/osgPresentation/SlideShowConstructor.cpp

@@ -1278 +1278 @@
 
 
-void SlideShowConstructor::addVNC(const std::string& hostname, const PositionData& positionData, const ImageData& imageData)
-{
+void SlideShowConstructor::addVNC(const std::string& hostname, const PositionData& positionData, const ImageData& imageData, const std::string& password)
+{
+    if (!password.empty())
+    {
+        OSG_NOTICE<<"Setting password"<<std::endl;
+        if (!osgDB::Registry::instance()->getAuthenticationMap()) osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
+        osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(hostname, new osgDB::AuthenticationDetails("", password));
+    }
+    
     addInteractiveImage(hostname+".vnc", positionData, imageData);
 }