X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foping.c;h=8286db0ea00d633774bba68828c22cf9f0bf1f8f;hb=1f1621d9d45b11aa130b85084fb4789e07747e08;hp=d84219eadad61d1b18f8a0bb392000c61d70d559;hpb=66464b61f8ee756dcfc0081944f4367da2b1a6ab;p=liboping.git

diff --git a/src/oping.c b/src/oping.c
index d84219e..8286db0 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -1,6 +1,6 @@
 /**
  * Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2010  Florian octo Forster <octo at verplant.org>
+ * Copyright (C) 2006-2010  Florian octo Forster <ff at octo.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,6 +89,11 @@
 # define _POSIX_SAVED_IDS 0
 #endif
 
+/* Remove GNU specific __attribute__ settings when using another compiler */
+#if !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
 typedef struct ping_context
 {
 	char host[NI_MAXHOST];
@@ -247,10 +252,6 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
 
 static void usage_exit (const char *name, int status) /* {{{ */
 {
-	int name_length;
-
-	name_length = (int) strlen (name);
-
 	fprintf (stderr, "Usage: %s [OPTIONS] "
 				"-f filename | host [host [host ...]]\n"
 
@@ -284,6 +285,8 @@ static void usage_qos_exit (const char *arg, int status) /* {{{ */
 			"    be                     Best Effort (BE, default PHB).\n"
 			"    ef                     Expedited Forwarding (EF) PHB group (RFC 3246).\n"
 			"                           (low delay, low loss, low jitter)\n"
+			"    va                     Voice Admit (VA) DSCP (RFC 5865).\n"
+			"                           (capacity-admitted traffic)\n"
 			"    af[1-4][1-3]           Assured Forwarding (AF) PHB group (RFC 2597).\n"
 			"                           For example: \"af12\" (class 1, precedence 2)\n"
 			"    cs[0-7]                Class Selector (CS) PHB group (RFC 2474).\n"
@@ -323,6 +326,9 @@ static int set_opt_send_qos (const char *opt) /* {{{ */
 	/* - Expedited Forwarding (EF, RFC 3246) */
 	else if (strcasecmp ("ef", opt) == 0)
 		opt_send_qos = 0xB8; /* == 0x2E << 2 */
+	/* - Voice Admit (VA, RFC 5865) */
+	else if (strcasecmp ("va", opt) == 0)
+		opt_send_qos = 0xB0; /* == 0x2D << 2 */
 	/* - Assured Forwarding (AF, RFC 2597) */
 	else if ((strncasecmp ("af", opt, strlen ("af")) == 0)
 			&& (strlen (opt) == 4))
@@ -414,6 +420,7 @@ static char *format_qos (uint8_t qos, char *buffer, size_t buffer_size) /* {{{ *
 	{
 		case 0x00: dscp_str = "be";  break;
 		case 0x2e: dscp_str = "ef";  break;
+		case 0x2d: dscp_str = "va";  break;
 		case 0x0a: dscp_str = "af11"; break;
 		case 0x0c: dscp_str = "af12"; break;
 		case 0x0e: dscp_str = "af13"; break;