ida-cvs Mailing List for Ida - Multimedia Access System

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/ida/mod_avap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16480/src

Modified Files:
	Makefile.am avap-cmds.c avap-cmds.h database.c mod_avap.c 
	protocol.c protocol.h 
Log Message:
- added databaseuser config flag
- some smaller fixes

Index: database.c
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/database.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** database.c	13 Jan 2005 16:19:03 -0000	1.8
--- database.c	14 Jan 2005 19:13:15 -0000	1.9
***************
*** 110,113 ****
--- 110,124 ----
  		}
  	}
+ 	if(config->databaseuser != NULL) {
+ 		size += 6 + strlen(config->databaseuser);
+ 		if(avdb_crequest != NULL) {
+ 			avdb_crequest = resize_string(avdb_crequest, size);
+ 			sprintf(avdb_crequest, "%s user=%s", avdb_crequest, config->databaseuser);
+ 		}
+ 		else {
+ 			avdb_crequest = malloc(size);
+ 			sprintf(avdb_crequest, "user=%s", config->databaseuser);
+ 		}
+ 	}
  	if(config->databasename != NULL) {
  		len = strlen(config->databasename);
***************
*** 135,139 ****

  	// connect postgresql server
! 	conn = db_connect(p, avdb_crequest);
  	ap_log_perror(APLOG_MARK, APLOG_INFO, 0, p, "Checking for database tables...");

--- 146,150 ----

  	// connect postgresql server
! 	if((conn = db_connect(p, avdb_crequest)) == NULL) return -1;
  	ap_log_perror(APLOG_MARK, APLOG_INFO, 0, p, "Checking for database tables...");

***************
*** 143,147 ****
  		PQclear(result);
  		PQfinish(conn);
! 		ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, p, "No Song-Table found in Database \"%s\"!", config->databasename);
  		return -1;
  	}
--- 154,158 ----
  		PQclear(result);
  		PQfinish(conn);
! 		ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, "No Song-Table found in Database \"%s\"!", config->databasename);
  		return -1;
  	}
***************
*** 448,456 ****
  {
  	PGconn *conn = PQconnectdb(request);
! 	if (PQstatus(conn) == CONNECTION_BAD)
! 		ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, p, "Can't connect to SQL server");
! 	else
! 		ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p, "Connected to Database \"%s\"", request);
! 
  	return conn;
  }
--- 459,467 ----
  {
  	PGconn *conn = PQconnectdb(request);
! 	if(PQstatus(conn) == CONNECTION_BAD) {
! 		ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, "Can't connect to SQL server: %s", request);
! 		return NULL;
! 	}
! 	ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p, "Connected to SQL server: %s", request);
  	return conn;
  }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	13 Jan 2005 16:19:03 -0000	1.5
--- Makefile.am	14 Jan 2005 19:13:15 -0000	1.6
***************
*** 10,12 ****

  ## Define the source file for the module
! libmodavap_la_SOURCES = mod_avap.c avap.h protocol.c protocol.h avap-items.h avap-cmds.h avap-cmds.c database.c database.h
--- 10,12 ----

  ## Define the source file for the module
! libmodavap_la_SOURCES = mod_avap.c avap.h protocol.c protocol.h avap-itmes.h avap-items.c avap-cmds.c avap-cmds.h database.c database.h tools.h tools.c

Index: avap-cmds.h
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/avap-cmds.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** avap-cmds.h	16 Jul 2004 18:56:45 -0000	1.5
--- avap-cmds.h	14 Jan 2005 19:13:15 -0000	1.6
***************
*** 38,41 ****
--- 38,43 ----
  const char* set_ava_protocol(cmd_parms *cmd, void *dummy, int flag);

+ const char* set_prealloc_protocols(cmd_parms *cmd, void *dummy, const char *arg);
+ 
  const char* set_avap_servername(cmd_parms *cmd, void *dummy, const char *arg);

Index: mod_avap.c
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/mod_avap.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mod_avap.c	13 Jan 2005 16:19:03 -0000	1.11
--- mod_avap.c	14 Jan 2005 19:13:15 -0000	1.12
***************
*** 41,51 ****
  int avap_init(apr_pool_t *p, apr_pool_t *ptemp, apr_pool_t *plog, server_rec *s)
  {
- 	ap_log_perror(APLOG_MARK, APLOG_INFO, 0, p, "AVAP: pre-config");
  	avap_conf_rec *conf = (avap_conf_rec *)ap_get_module_config(s->module_config, &avap_module);
- 	ap_log_perror(APLOG_MARK, APLOG_INFO, 0, p, "AVAP: post-config");
  	// initialize database and protocol
! 	if(db_check_relations() == -1) return !OK;
! 	if(init_protocols(p, conf) == -1) return !OK;
! 
  	return OK;
  }
--- 41,54 ----
  int avap_init(apr_pool_t *p, apr_pool_t *ptemp, apr_pool_t *plog, server_rec *s)
  {
  	avap_conf_rec *conf = (avap_conf_rec *)ap_get_module_config(s->module_config, &avap_module);
  	// initialize database and protocol
! 	if(db_check_relations(p, conf) == -1) {
! 		ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, "Checking for Database Tables");
! 		return !OK;
! 	}
! 	if(init_protocols(p, conf) == -1) {
! 		ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, "Initializing Protocolls");
! 		return !OK;
! 	}
  	return OK;
  }
***************
*** 59,69 ****

  	// This is a fix needed when iTunes tries to connect
! 	// iTunes does not set the hostname, but apache header parsers won't like that
         	if(!r->hostname && !apr_table_get(r->headers_in, "Host")) {
  		apr_table_set(r->headers_in, "Host", conf->servername);
  	}

- 
- 
  	return OK;
  }
--- 62,70 ----

  	// This is a fix needed when iTunes tries to connect
! 	// iTunes does not set the hostname but apache header parsers expects it
         	if(!r->hostname && !apr_table_get(r->headers_in, "Host")) {
  		apr_table_set(r->headers_in, "Host", conf->servername);
  	}

  	return OK;
  }
***************
*** 172,176 ****
  	// This is a fix needed for iTunes. chunked encoding causes trouble,
  	// so we are using deflate compression.
! 	ap_add_output_filter("DEFLATE", NULL, r, r->connection);

  	buffer = get_response(r->pool, request_type);
--- 173,177 ----
  	// This is a fix needed for iTunes. chunked encoding causes trouble,
  	// so we are using deflate compression.
! 	//	ap_add_output_filter("DEFLATE", NULL, r, r->connection);

  	buffer = get_response(r->pool, request_type);
***************
*** 183,191 ****
  static void avap_register_hooks(apr_pool_t *p)
  {
- 	ap_log_perror(APLOG_MARK, APLOG_INFO, 0, p, "AVAP: pre-hook-reg");
  	ap_hook_post_config(avap_init, NULL, NULL, APR_HOOK_MIDDLE);
  	ap_hook_create_request(avap_preset_request, NULL, NULL, APR_HOOK_REALLY_FIRST);
  	ap_hook_handler(avap_get_response, NULL , NULL, APR_HOOK_REALLY_FIRST);
- 	ap_log_perror(APLOG_MARK, APLOG_INFO, 0, p, "AVAP: post-hook-reg");
  }

--- 184,190 ----
***************
*** 197,200 ****
--- 196,201 ----
  		     "To enable/disable use: AVAProtocol <on/off>"),
  	// FIXME: following opts should be limited to global
+ 	AP_INIT_TAKE12("AVAPPrealloc", set_prealloc_protocols, NULL, RSRC_CONF,
+ 		      "Set Protocoll preallocation: AVAPPrealloc avap[,daap]"),
  	AP_INIT_TAKE1("AVAPHostname", set_avap_servername, NULL, RSRC_CONF,
  		      "Set Hostname: AVAPHostname <Name>"),

Index: protocol.c
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/protocol.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** protocol.c	13 Jan 2005 16:19:04 -0000	1.7
--- protocol.c	14 Jan 2005 19:13:16 -0000	1.8
***************
*** 43,46 ****
--- 43,52 ----

  /**
+  * set audio db, song playlist and song playlist to null
+  * !!!: this has to be done before database scan and prot. init
+  */
+ void preset_protocols();
+ 
+ /**
   * initialize AVAP protocol datablocks
   */
***************
*** 109,112 ****
--- 115,121 ----
  int init_protocols(apr_pool_t *p, avap_conf_rec *conf)
  {
+ 	preset_protocols();
+ 	db_adbs_update(p, conf);
+ 
  	if((conf->prealloc & 0x0F) == 0x0F)
  		if(init_AVAP_protocol(p, conf) != 0) return -1;

Index: protocol.h
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/protocol.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** protocol.h	13 Jan 2005 16:19:04 -0000	1.5
--- protocol.h	14 Jan 2005 19:13:16 -0000	1.6
***************
*** 105,115 ****

  /**
-  * set audio db, song playlist and song playlist to null
-  * !!!: this has to be done before database scan and prot. init
-  */
- void preset_protocols();
- 
- 
- /**
   * initialize protocol datablocks
   */
--- 105,108 ----

Index: avap-cmds.c
===================================================================
RCS file: /cvsroot/ida/mod_avap/src/avap-cmds.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** avap-cmds.c	16 Jul 2004 18:56:45 -0000	1.5
--- avap-cmds.c	14 Jan 2005 19:13:15 -0000	1.6
***************
*** 27,30 ****
--- 27,31 ----

  #include "avap.h"
+ #include "protocol.h"
  #include "avap-cmds.h"

***************
*** 42,45 ****
--- 43,47 ----

  	conf->avap_on = -1;
+ 	conf->prealloc = PREALLOC_DAAP | PREALLOC_AVAP;

  	// set some defaults
***************
*** 52,56 ****

  	conf->databasehost = NULL;
! 	conf->sql_port = -1;        // use default port

  	return (void*) conf;
--- 54,58 ----

  	conf->databasehost = NULL;
! 	conf->sql_port = 0;        // use default port

  	return (void*) conf;
***************
*** 74,81 ****
  	// TODO: setting multiple database needs another post 
  	//       config hook for virtual base
! 
! 	CfgMergeString(databaseuser);
! 	CfgMergeString(databasehost);
! 	CfgMergeInt(sql_port);

  	merge->servername = add->servername;
--- 76,82 ----
  	// TODO: setting multiple database needs another post 
  	//       config hook for virtual base
! 	//	CfgMergeString(databaseuser);
! 	//	CfgMergeString(databasehost);
! 	//	CfgMergeShort(sql_port);

  	merge->servername = add->servername;
***************
*** 83,86 ****
--- 84,88 ----
  	merge->video_dbname = add->video_dbname;
  	merge->databasename = add->databasename;
+ 	merge->databaseuser = add->databaseuser;

  	return merge;
***************
*** 102,105 ****
--- 104,126 ----
  }

+ const char* set_prealloc_protocols(cmd_parms *cmd, void *dummy, const char *arg)
+ {
+ 	server_rec *s = cmd->server;
+ 	avap_conf_rec *conf = (avap_conf_rec *)ap_get_module_config(s->module_config, &avap_module);
+ 
+ 	const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+ 	if(err) {
+ 		return err;
+ 	}
+ 
+ 	conf->prealloc = 0;
+ 	if(strstr(arg, "avap"))
+ 		conf->prealloc |= PREALLOC_AVAP;
+ 	if(strstr(arg, "daap"))
+ 		conf->prealloc |= PREALLOC_DAAP;
+ 
+ 	return NULL;
+ }
+ 
  const char* set_avap_servername(cmd_parms *cmd, void *dummy, const char *arg)
  {
***************
*** 107,111 ****
  	avap_conf_rec *conf = (avap_conf_rec *)ap_get_module_config(s->module_config, &avap_module);
  	const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
! 	if (err) {
  		return err;
  	}
--- 128,132 ----
  	avap_conf_rec *conf = (avap_conf_rec *)ap_get_module_config(s->module_config, &avap_module);
  	const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
! 	if(err) {
  		return err;
  	}
***************
*** 182,191 ****

  	const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
! 	if (err) {
  		return err;
  	}
- 
  	conf->databaseuser = apr_pstrdup(cmd->pool, arg);
- 
  	return NULL;
  }
--- 203,210 ----

  	const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
! 	if(err) {
  		return err;
  	}
  	conf->databaseuser = apr_pstrdup(cmd->pool, arg);
  	return NULL;
  }

2004	Jan	Feb	Mar	Apr	May	Jun	Jul (22)	Aug	Sep	Oct (19)	Nov (101)	Dec (106)
2005	Jan (21)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

ida-cvs Mailing List for Ida - Multimedia Access System

ida-cvs — Ida CVS News