[dev] merged branch 'streamingsystems-master' (#273).

Author: winshining

hls/ngx_rtmp_hls_module.c

@@ -19,19 +19,21 @@ static ngx_rtmp_stream_begin_pt         next_stream_begin;
 static ngx_rtmp_stream_eof_pt           next_stream_eof;
 
 
-static char * ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd,
+static char *ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd,
        void *conf);
 static ngx_int_t ngx_rtmp_hls_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf,
+static void *ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf);
+static char *ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf,
        void *parent, void *child);
 static ngx_int_t ngx_rtmp_hls_flush_audio(ngx_rtmp_session_t *s);
 static ngx_int_t ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s,
        ngx_str_t *path);
+static char *ngx_rtmp_hls_set_permissions(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
 
 
 #define NGX_RTMP_HLS_BUFSIZE            (1024*1024)
-#define NGX_RTMP_HLS_DIR_ACCESS         0744
+#define NGX_RTMP_HLS_DEFAULT_DIR_ACCESS 0744
 
 
 typedef struct {
@@ -115,6 +117,8 @@ typedef struct {
     ngx_str_t                           key_path;
     ngx_str_t                           key_url;
     ngx_uint_t                          frags_per_key;
+    ngx_uint_t                          dir_access;
+    ngx_str_t                           nested_index_filename;
 } ngx_rtmp_hls_app_conf_t;
 
 
@@ -309,6 +313,20 @@ static ngx_command_t ngx_rtmp_hls_commands[] = {
       offsetof(ngx_rtmp_hls_app_conf_t, frags_per_key),
       NULL },
 
+    { ngx_string("hls_dir_access"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_hls_set_permissions,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, dir_access),
+      NULL },
+
+    { ngx_string("hls_nested_index_filename"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, nested_index_filename),
+      NULL },
+
     ngx_null_command
 };
 
@@ -450,7 +468,7 @@ ngx_rtmp_hls_write_variant_playlist(ngx_rtmp_session_t *s)
                          ctx->name.len - ctx->var->suffix.len, ctx->name.data,
                          &var->suffix);
         if (hacf->nested) {
-            p = ngx_slprintf(p, last, "%s", "/index");
+            p = ngx_slprintf(p, last, "/%V", &hacf->nested_index_filename);
         }
 
         p = ngx_slprintf(p, last, "%s", ".m3u8\n");
@@ -1202,7 +1220,7 @@ ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s, ngx_str_t *path)
 
         /* ENOENT */
 
-        if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) {
+        if (ngx_create_dir(zpath, hacf->dir_access) == NGX_FILE_ERROR) {
             ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
                           "hls: " ngx_create_dir_n " failed on '%V'", path);
             return NGX_ERROR;
@@ -1264,7 +1282,7 @@ ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s, ngx_str_t *path)
 
     /* NGX_ENOENT */
 
-    if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) {
+    if (ngx_create_dir(zpath, hacf->dir_access) == NGX_FILE_ERROR) {
         ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
                       "hls: " ngx_create_dir_n " failed on '%s'", zpath);
         return NGX_ERROR;
@@ -1350,7 +1368,7 @@ ngx_rtmp_hls_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
 
     len = hacf->path.len + 1 + ctx->name.len + sizeof(".m3u8");
     if (hacf->nested) {
-        len += sizeof("/index") - 1;
+        len += hacf->nested_index_filename.len + 1;
     }
 
     ctx->playlist.data = ngx_palloc(s->connection->pool, len);
@@ -1421,11 +1439,13 @@ ngx_rtmp_hls_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
     /* playlist path */
 
     if (hacf->nested) {
-        p = ngx_cpymem(p, "/index.m3u8", sizeof("/index.m3u8") - 1);
-    } else {
-        p = ngx_cpymem(p, ".m3u8", sizeof(".m3u8") - 1);
+        p = ngx_cpymem(p, "/", sizeof("/") - 1);
+        p = ngx_cpymem(p, hacf->nested_index_filename.data,
+                       hacf->nested_index_filename.len);
     }
 
+    p = ngx_cpymem(p, ".m3u8", sizeof(".m3u8") - 1);
+
     ctx->playlist.len = p - ctx->playlist.data;
 
     *p = 0;
@@ -2323,6 +2343,52 @@ ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static char *
+ngx_rtmp_hls_set_permissions(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_hls_app_conf_t  *hacf = conf;
+
+    size_t            i;
+    ngx_uint_t        f, base, step;
+    ngx_str_t        *value;
+
+    if (hacf->dir_access != NGX_CONF_UNSET_UINT) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+    if (value[1].data[0] != '0') {
+        return "invalid octal: should start with 0";
+    }
+
+    if (value[1].len != 4) {
+        return "invalid permission mask: should be exactly 4 characters long";
+    }
+
+    hacf->dir_access = 0;
+    f = 1;
+
+    for (base = 8, step = 0; base != 1; base >>= 1) {
+        step++;
+    }
+
+    for (i = value[1].len - 2; i >= 1; i--) {
+        f <<= step;
+    }
+
+    for (i = 1; i < value[1].len; i++) {
+        if (value[1].data[i] < '0' || value[1].data[i] > '7') {
+            return "invalid octal number";
+        }
+
+        hacf->dir_access += (value[1].data[i] - '0') * f;
+        f >>= step;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static void *
 ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf)
 {
@@ -2350,6 +2416,7 @@ ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf)
     conf->granularity = NGX_CONF_UNSET;
     conf->keys = NGX_CONF_UNSET;
     conf->frags_per_key = NGX_CONF_UNSET_UINT;
+    conf->dir_access = NGX_CONF_UNSET_UINT;
 
     return conf;
 }
@@ -2385,9 +2452,12 @@ ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->base_url, prev->base_url, "");
     ngx_conf_merge_value(conf->granularity, prev->granularity, 0);
     ngx_conf_merge_value(conf->keys, prev->keys, 0);
-    /*ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");*/
     ngx_conf_merge_str_value(conf->key_url, prev->key_url, "");
     ngx_conf_merge_uint_value(conf->frags_per_key, prev->frags_per_key, 0);
+    ngx_conf_merge_uint_value(conf->dir_access, prev->dir_access,
+                              NGX_RTMP_HLS_DEFAULT_DIR_ACCESS);
+    ngx_conf_merge_str_value(conf->nested_index_filename,
+                             prev->nested_index_filename, "index");
 
     if (conf->fraglen) {
         conf->winfrags = conf->playlen / conf->fraglen;