Don't forget ntohs.

James William Pye · James William Pye · commit d12d4465fbf8 · 2009-05-19T14:56:41.000-07:00
diff --git a/postgresql/protocol/optimized/element3.c b/postgresql/protocol/optimized/element3.c
@@ -58,7 +58,7 @@ parse_tuple_message(PyObject *self, PyObject *args)
 			"invalid tuple message: %d bytes is too small", dlen);
 		return(NULL);
 	}
-	natts = ntohs(*((uint16_t *) (data)));
+	natts = local_ntohs(*((uint16_t *) (data)));
 
 	/*
 	 * FEARME: A bit much for saving a reallocation/copy?
@@ -91,7 +91,7 @@ parse_tuple_message(PyObject *self, PyObject *args)
 			goto cleanup;
 		}
 
-		attsize = ntohl(*((uint32_t *) (data + position)));
+		attsize = local_ntohl(*((uint32_t *) (data + position)));
 		position += 4;
 		/*
 		 * NULL.
diff --git a/postgresql/protocol/optimized/module.c b/postgresql/protocol/optimized/module.c
@@ -21,6 +21,7 @@
  */
 static PyObject *message_types = NULL;
 static long (*local_ntohl)(long) = NULL;
+static short (*local_ntohs)(short) = NULL;
 
 
 #include "typio.c"
@@ -74,11 +75,13 @@ PyInit_optimized(void)
 	{
 		/* little */
 		local_ntohl = swap_long;
+		local_ntohs = swap_short;
 	}
 	else
 	{
 		/* big */
 		local_ntohl = return_long;
+		local_ntohs = return_short;
 	}
 
 	/*
diff --git a/postgresql/protocol/optimized/typio.c b/postgresql/protocol/optimized/typio.c
@@ -35,6 +35,19 @@
 	c=P[4];P[4]=P[3];P[3]=c;\
 }while(0)
 
+static short
+swap_short(short s)
+{
+	swap2(((char *) &s));
+	return(s);
+}
+
+static short
+return_short(short s)
+{
+	return(s);
+}
+
 static long
 swap_long(long l)
 {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`static PyObject *message_types = NULL;`
`23`	`23`	`static long (*local_ntohl)(long) = NULL;`
	`24`	`+static short (*local_ntohs)(short) = NULL;`
`24`	`25`
`25`	`26`
`26`	`27`	`#include "typio.c"`
`@@ -74,11 +75,13 @@ PyInit_optimized(void)`
`74`	`75`	`{`
`75`	`76`	`/* little */`
`76`	`77`	`local_ntohl = swap_long;`
	`78`	`+ local_ntohs = swap_short;`
`77`	`79`	`}`
`78`	`80`	`else`
`79`	`81`	`{`
`80`	`82`	`/* big */`
`81`	`83`	`local_ntohl = return_long;`
	`84`	`+ local_ntohs = return_short;`
`82`	`85`	`}`
`83`	`86`
`84`	`87`	`/*`