rename publishSRTPassphrase into srtPublishPassphrase, readSRTPassphr…

…ase into srtReadPassphrase

apidocs/openapi.yaml

@@ -239,9 +239,9 @@ components:
           type: boolean
         fallback:
           type: string
-        publishSRTPassphrase:
+        srtPublishPassphrase:
           type: string
-        readSRTPassphrase:
+        srtReadPassphrase:
           type: string
 
         # RTSP

internal/conf/conf_test.go

@@ -305,14 +305,14 @@ func TestConfErrors(t *testing.T) {
 			"invalid srt publish passphrase",
 			"paths:\n" +
 				"  mypath:\n" +
-				"    publishSRTPassphrase: a\n",
-			`invalid 'publishSRTPassphrase': must be between 10 and 79 characters`,
+				"    srtPublishPassphrase: a\n",
+			`invalid 'srtPublishPassphrase': must be between 10 and 79 characters`,
 		},
 		{
 			"invalid srt read passphrase",
 			"paths:\n" +
 				"  mypath:\n" +
-				"    readSRTPassphrase: a\n",
+				"    srtReadPassphrase: a\n",
 			`invalid 'readRTPassphrase': must be between 10 and 79 characters`,
 		},
 	} {

internal/conf/path.go

@@ -81,8 +81,8 @@ type PathConf struct {
 	RtspRangeStart      string         `json:"rtspRangeStart"`
 
 	// SRT
-	PublishSRTPassphrase string `json:"publishSRTPassphrase"`
-	ReadSRTPassphrase    string `json:"readSRTPassphrase"`
+	SRTPublishPassphrase string `json:"srtPublishPassphrase"`
+	SRTReadPassphrase    string `json:"srtReadPassphrase"`
 
 	// Redirect
 	SourceRedirect string `json:"sourceRedirect"`
@@ -378,14 +378,14 @@ func (pconf *PathConf) check(conf *Conf, name string) error {
 
 	// SRT
 
-	if pconf.PublishSRTPassphrase != "" {
-		err := srtCheckPassphrase(pconf.PublishSRTPassphrase)
+	if pconf.SRTPublishPassphrase != "" {
+		err := srtCheckPassphrase(pconf.SRTPublishPassphrase)
 		if err != nil {
-			return fmt.Errorf("invalid 'publishSRTPassphrase': %v", err)
+			return fmt.Errorf("invalid 'srtPublishPassphrase': %v", err)
 		}
 	}
-	if pconf.ReadSRTPassphrase != "" {
-		err := srtCheckPassphrase(pconf.ReadSRTPassphrase)
+	if pconf.SRTReadPassphrase != "" {
+		err := srtCheckPassphrase(pconf.SRTReadPassphrase)
 		if err != nil {
 			return fmt.Errorf("invalid 'readRTPassphrase': %v", err)
 		}

internal/core/srt_conn.go

@@ -239,7 +239,7 @@ func (c *srtConn) runPublish(req srtNewConnReq, pathName string, user string, pa
 
 	defer res.path.removePublisher(pathRemovePublisherReq{author: c})
 
-	err := srtCheckPassphrase(req.connReq, res.path.conf.PublishSRTPassphrase)
+	err := srtCheckPassphrase(req.connReq, res.path.conf.SRTPublishPassphrase)
 	if err != nil {
 		return false, err
 	}
@@ -336,7 +336,7 @@ func (c *srtConn) runRead(req srtNewConnReq, pathName string, user string, pass
 
 	defer res.path.removeReader(pathRemoveReaderReq{author: c})
 
-	err := srtCheckPassphrase(req.connReq, res.path.conf.ReadSRTPassphrase)
+	err := srtCheckPassphrase(req.connReq, res.path.conf.SRTReadPassphrase)
 	if err != nil {
 		return false, err
 	}

internal/core/srt_server_test.go

@@ -22,10 +22,10 @@ func TestSRTServer(t *testing.T) {
 
 			switch ca {
 			case "publish passphrase":
-				conf += "    publishSRTPassphrase: 123456789abcde"
+				conf += "    srtPublishPassphrase: 123456789abcde"
 
 			case "read passphrase":
-				conf += "    readSRTPassphrase: 123456789abcde"
+				conf += "    srtReadPassphrase: 123456789abcde"
 			}
 
 			p, ok := newInstance(conf)

mediamtx.yml

@@ -339,9 +339,9 @@ paths:
     # It can be can be a relative path  (i.e. /otherstream) or an absolute RTSP URL.
     fallback:
     # SRT encryption passphrase required to publish on this path
-    publishSRTPassphrase:
+    srtPublishPassphrase:
     # SRT encryption passphrase require to read from this path
-    readSRTPassphrase:
+    srtReadPassphrase:
 
     ###############################################
     # RTSP path settings (when source is a RTSP or a RTSPS URL)