summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--misc.c15
-rw-r--r--misc.h3
-rw-r--r--servconf.c5
4 files changed, 24 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b12fa966..695f4ed22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,11 @@
38 - stevesk@cvs.openbsd.org 2011/03/24 22:14:54 38 - stevesk@cvs.openbsd.org 2011/03/24 22:14:54
39 [ssh-keygen.c] 39 [ssh-keygen.c]
40 use strcasecmp() for "clear" cert permission option also; ok djm 40 use strcasecmp() for "clear" cert permission option also; ok djm
41 - stevesk@cvs.openbsd.org 2011/03/29 18:54:17
42 [misc.c misc.h servconf.c]
43 print ipqos friendly string for sshd -T; ok markus
44 # sshd -Tf sshd_config|grep ipqos
45 ipqos lowdelay throughput
41 46
4220110221 4720110221
43 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 48 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/misc.c b/misc.c
index 919b04e6b..5f63090d9 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.84 2010/11/21 01:01:13 djm Exp $ */ 1/* $OpenBSD: misc.c,v 1.85 2011/03/29 18:54:17 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -985,6 +985,19 @@ parse_ipqos(const char *cp)
985 return val; 985 return val;
986} 986}
987 987
988const char *
989iptos2str(int iptos)
990{
991 int i;
992 static char iptos_str[sizeof "0xff"];
993
994 for (i = 0; ipqos[i].name != NULL; i++) {
995 if (ipqos[i].value == iptos)
996 return ipqos[i].name;
997 }
998 snprintf(iptos_str, sizeof iptos_str, "0x%02x", iptos);
999 return iptos_str;
1000}
988void 1001void
989sock_set_v6only(int s) 1002sock_set_v6only(int s)
990{ 1003{
diff --git a/misc.h b/misc.h
index 65cf4a616..f3142a95e 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.47 2010/11/21 01:01:13 djm Exp $ */ 1/* $OpenBSD: misc.h,v 1.48 2011/03/29 18:54:17 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -89,6 +89,7 @@ void bandwidth_limit_init(struct bwlimit *, u_int64_t, size_t);
89void bandwidth_limit(struct bwlimit *, size_t); 89void bandwidth_limit(struct bwlimit *, size_t);
90 90
91int parse_ipqos(const char *); 91int parse_ipqos(const char *);
92const char *iptos2str(int);
92void mktemp_proto(char *, size_t); 93void mktemp_proto(char *, size_t);
93 94
94/* readpass.c */ 95/* readpass.c */
diff --git a/servconf.c b/servconf.c
index e2f20a3d1..48cb0d5b1 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.213 2010/11/13 23:27:50 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.214 2011/03/29 18:54:17 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1775,7 +1775,8 @@ dump_config(ServerOptions *o)
1775 } 1775 }
1776 dump_cfg_string(sPermitTunnel, s); 1776 dump_cfg_string(sPermitTunnel, s);
1777 1777
1778 printf("ipqos 0x%02x 0x%02x\n", o->ip_qos_interactive, o->ip_qos_bulk); 1778 printf("ipqos %s ", iptos2str(o->ip_qos_interactive));
1779 printf("%s\n", iptos2str(o->ip_qos_bulk));
1779 1780
1780 channel_print_adm_permitted_opens(); 1781 channel_print_adm_permitted_opens();
1781} 1782}