Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/.gitignore
	lib/command.c
	lib/command.h

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/network.c b/lib/network.c
index 3373983b3c..5379ecb5a6 100644
--- a/lib/network.c
+++ b/lib/network.c
@@ -93,3 +93,21 @@ set_nonblocking(int fd)
     }
   return 0;
 }
+
+float
+htonf (float host)
+{
+  u_int32_t lu1, lu2;
+  float convert;
+
+  memcpy (&lu1, &host, sizeof (u_int32_t));
+  lu2 = htonl (lu1);
+  memcpy (&convert, &lu2, sizeof (u_int32_t));
+  return convert;
+}
+
+float
+ntohf (float net)
+{
+  return htonf (net);
+}