Abort on unrecognized options

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@397 400ebc74-4327-4243-bc38-086b20814532

diff --git a/rtmpdump.c b/rtmpdump.c
index a5ef241f51226e3576c66339496b25cf9059f429..cc470330a98888823c2f4cd5d2aa5f47516039fc 100644 (file)
--- a/rtmpdump.c
+++ b/rtmpdump.c
@@ -1122,6 +1122,7 @@ main(int argc, char **argv)
          break;
        default:
          RTMP_LogPrintf("unknown option: %c\n", opt);
+         return RD_FAILED;
          break;
        }
     }

diff --git a/rtmpgw.c b/rtmpgw.c
index 29cebc3e8f3bee80703a1915efa37852582286f4..0a67c2185c040ca487bac5ba9fcef6eab10e9639 100644 (file)
--- a/rtmpgw.c
+++ b/rtmpgw.c
@@ -446,7 +446,11 @@ void processTCPrequest(STREAMING_SERVER * server,  // server socket and state (ou
                  ptr += nArgLen + 1;
                  len -= nArgLen + 1;
 
-                 ParseOption(ich, arg, &req);
+                 if (!ParseOption(ich, arg, &req))
+                   {
+                     status = "400 unrecognized option";
+                     goto filenotfound;
+                   }
                }
            }
        }
@@ -953,7 +957,7 @@ ParseOption(char opt, char *arg, RTMP_REQUEST * req)
       break;
     default:
       RTMP_LogPrintf("unknown option: %c, arg: %s\n", opt, arg);
-      break;
+      return false;
     }
   return true;
 }
@@ -1142,7 +1146,8 @@ main(int argc, char **argv)
          }
        default:
          //RTMP_LogPrintf("unknown option: %c\n", opt);
-         ParseOption(opt, optarg, &defaultRTMPRequest);
+         if (!ParseOption(opt, optarg, &defaultRTMPRequest))
+           return RD_FAILED;
          break;
        }
     }