merge 5.9p1

1 files changed, 14 insertions, 1 deletions

diff --git a/misc.c b/misc.c
index 919b04e6b..5f63090d9 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.84 2010/11/21 01:01:13 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.85 2011/03/29 18:54:17 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -985,6 +985,19 @@ parse_ipqos(const char *cp)
         return val;
 }
 
+const char *
+iptos2str(int iptos)
+{
+        int i;
+        static char iptos_str[sizeof "0xff"];
+
+        for (i = 0; ipqos[i].name != NULL; i++) {
+                if (ipqos[i].value == iptos)
+                        return ipqos[i].name;
+        }
+        snprintf(iptos_str, sizeof iptos_str, "0x%02x", iptos);
+        return iptos_str;
+}
 void
 sock_set_v6only(int s)
 {