Error Codes

1. Rename an error code that was prefixed with WC_ instead of WS_.
2. Add a new error code for missing callbacks.
3. Remove a redundant error code. Channel pending appeared twice.
4. Fix the error code vs string test.

Author: ejohnstown

src/internal.c

@@ -245,9 +245,6 @@ const char* GetErrorString(int err)
         case WS_INVALID_EXTDATA:
             return "invalid extended data type";
 
-        case WS_CHAN_PENDING:
-            return "channel open pending";
-
         case WS_SFTP_BAD_REQ_ID:
             return "sftp bad request id";
 
@@ -284,12 +281,15 @@ const char* GetErrorString(int err)
         case WS_CHANNEL_NOT_CONF:
             return "channel open not confirmed";
 
-        case WC_CHANGE_AUTH_E:
+        case WS_CHANGE_AUTH_E:
             return "changing auth type attempt";
 
         case WS_WINDOW_FULL:
             return "peer's channel window full";
 
+        case WS_MISSING_CALLBACK:
+            return "missing a callback function";
+
         default:
             return "Unknown error code";
     }

tests/unit.c

@@ -420,13 +420,13 @@ static int test_Errors(void)
 #else
     int i, j = 0;
     /* Values that are not or no longer error codes. */
-    int missing[] = { 0 };
+    int missing[] = { -1059 };
     int missingSz = (int)sizeof(missing)/sizeof(missing[0]);
 
     /* Check that all errors have a string and it's the same through the two
      * APIs. Check that the values that are not errors map to the unknown
      * string.  */
-    for (i = WS_FATAL_ERROR; i >= WS_LAST_E; i--) {
+    for (i = WS_ERROR; i >= WS_LAST_E; i--) {
         errStr = wolfSSH_ErrorToName(i);
 
         if (j < missingSz && i == missing[j]) {

wolfssh/error.h

@@ -97,7 +97,6 @@ enum WS_ErrorCodes {
     WS_NEXT_ERROR           = -1056, /* Getting next value/state is error */
     WS_CHAN_RXD             = -1057, /* Status that channel data received. */
     WS_INVALID_EXTDATA      = -1058, /* invalid Channel Extended Data Type */
-    WS_CHAN_PENDING         = -1059, /* peer hasn't confirmed channel open */
     WS_SFTP_BAD_REQ_ID      = -1060, /* SFTP Bad request ID */
     WS_SFTP_BAD_REQ_TYPE    = -1061, /* SFTP Bad request ID */
     WS_SFTP_STATUS_NOT_OK   = -1062, /* SFTP Status not OK */
@@ -110,10 +109,11 @@ enum WS_ErrorCodes {
     WS_SSH_NULL_E           = -1069, /* SSH was null */
     WS_SSH_CTX_NULL_E       = -1070, /* SSH_CTX was null */
     WS_CHANNEL_NOT_CONF     = -1071, /* Channel open not confirmed. */
-    WC_CHANGE_AUTH_E        = -1072, /* Changing auth type attempt */
+    WS_CHANGE_AUTH_E        = -1072, /* Changing auth type attempt */
     WS_WINDOW_FULL          = -1073,
+    WS_MISSING_CALLBACK     = -1074, /* Callback is missing */
 
-    WS_LAST_E               = -1073  /* Update this to indicate last error */
+    WS_LAST_E               = -1074  /* Update this to indicate last error */
 };