--- a/src/devices/wifi/ssid.cc	Tue Sep 02 15:17:43 2008 -0700
+++ b/src/devices/wifi/ssid.cc	Tue Sep 02 15:17:54 2008 -0700
@@ -32,8 +32,10 @@
       m_ssid[i] = 0;
     }
 }
-Ssid::Ssid (char const *ssid)
+Ssid::Ssid (std::string s)
 {
+  NS_ASSERT (s.size () < 32);
+  const char *ssid = s.c_str ();
   uint8_t len = 0;
   while (*ssid != 0 && len < 32) 
     {

--- a/src/devices/wifi/ssid.h	Tue Sep 02 15:17:43 2008 -0700
+++ b/src/devices/wifi/ssid.h	Tue Sep 02 15:17:54 2008 -0700
@@ -35,8 +35,7 @@
 public:
   // broadcast ssid
   Ssid ();
-  /* 0-terminated string */
-  Ssid (char const *ssid);
+  Ssid (std::string s);
   Ssid (char const ssid[32], uint8_t length);
 
   bool IsEqual (Ssid const &o) const;