Changeset 7968 for lang/c

Timestamp:

03/15/08 13:38:33 (9 months ago)

Author:

frsyuki

Message:

lang/c/partty: fixed wrong header parsing

Location:

lang/c/partty/trunk

Files:

• configure.in (modified) (1 diff)
• src/server.cc (modified) (5 diffs)

lang/c/partty/trunk/configure.in

@@ -37 +37 @@
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h termios.h unistd.h])
 
+AC_LANG_PUSH([C++])
+AC_CHECK_HEADERS([tr1/functional boost/tr1/functional.hpp boost/function.hpp boost/bind.hpp])
+AC_LANG_POP([C++])
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL

lang/c/partty/trunk/src/server.cc

@@ -262 +262 @@
         next_host->readonly_password_length = header->readonly_password_length;
 
+        // message
         std::memcpy( next_host->message,
                      payload,
@@ -267 +268 @@
         next_host->message[header->message_length] = '\0';
 
+        // session name
         std::memcpy( next_host->session_name,
                      (char*)payload + next_host->message_length,
@@ -272 +274 @@
         next_host->session_name[header->session_name_length] = '\0';
 
+        // writable password
         std::memcpy( next_host->writable_password,
                      (char*)payload + next_host->message_length
@@ -278 +281 @@
         next_host->writable_password[header->writable_password_length] = '\0';
 
+        // readonly password
         std::memcpy( next_host->readonly_password,
                      (char*)payload + next_host->message_length
                                     + next_host->session_name_length
-                                    + next_host->readonly_password_length,
+                                    + next_host->writable_password_length,
                      header->readonly_password_length);
         next_host->readonly_password[header->readonly_password_length] = '\0';
@@ -338 +342 @@
         stream.write(info.message, info.message_length) << "\n";
 
+        stream << "operation-password: ";
+        stream.write(info.writable_password, info.writable_password_length) << "\n";
+
         stream << "view-only-password: ";
-        stream.write(info.readonly_password, info.readonly_password_length) << "\n";
-
-        stream << "operation-password: ";
         stream.write(info.readonly_password, info.readonly_password_length) << "\n";
 }