Se ponen mejor los tipos de ipaddr y se reemplaza el constructor desde char* por

[z.facultad/75.74/practicos.git] / practicas / pipi / src / ipaddr.cpp

diff --git a/practicas/pipi/src/ipaddr.cpp b/practicas/pipi/src/ipaddr.cpp
index 6b052c8d8851c7d8d4074f8464969e3e89512f2c..5d9bfdf4633ffb6fc3c10d5e42a33afe625443af 100644 (file)
--- a/practicas/pipi/src/ipaddr.cpp
+++ b/practicas/pipi/src/ipaddr.cpp
@@ -21,7 +21,7 @@ IPAddr::IPAddr(atom a1, atom a2, atom a3, atom a4)
 }
 
 /// Constructor
 }
 
 /// Constructor

-IPAddr::IPAddr(unsigned ip)
+IPAddr::IPAddr(uint32_t ip)

 {
     atoms[0] = ip >> 24;
     atoms[1] = ip >> 16;
 {
     atoms[0] = ip >> 24;
     atoms[1] = ip >> 16;


@@ -29,20 +29,36 @@ IPAddr::IPAddr(unsigned ip)
     atoms[3] = ip;
 }
 
     atoms[3] = ip;
 }
 

+#if 0

 /// Constructor
 /// Constructor

-IPAddr::IPAddr(std::string ip) throw (std::logic_error)
+IPAddr::IPAddr(const char* ip) throw (std::logic_error)

 {
     std::istringstream iss(ip);
 {
     std::istringstream iss(ip);

+    std::string ips;

     for (int i = 0; i < 4; ++i)
     {
     for (int i = 0; i < 4; ++i)
     {

-        if (!std::getline(iss, ip, '.'))
+        if (!std::getline(iss, ips, '.'))

             throw std::logic_error("Dirección IP inválida");
             throw std::logic_error("Dirección IP inválida");

-        atoms[i] = std::atoi(ip.c_str());
+        atoms[i] = std::atoi(ips.c_str());
+    }
+}
+#endif
+
+/// Constructor
+IPAddr::IPAddr(const std::string& ip) throw (std::logic_error)
+{
+    std::istringstream iss(ip);
+    std::string ips;
+    for (int i = 0; i < 4; ++i)
+    {
+        if (!std::getline(iss, ips, '.'))
+            throw std::logic_error("Dirección IP inválida");
+        atoms[i] = std::atoi(ips.c_str());

     }
 }
 
 /// Operador de casteo a unsigned
     }
 }
 
 /// Operador de casteo a unsigned

-IPAddr::operator unsigned () const
+IPAddr::operator uint32_t () const

 {
     return (atoms[0] << 24) + (atoms[1] << 16) + (atoms[2] << 8) + atoms[3];
 }
 {
     return (atoms[0] << 24) + (atoms[1] << 16) + (atoms[2] << 8) + atoms[3];
 }