msn-proxy-devel Mailing List for msn-proxy: the msn connection control (Page 3)
Brought to you by:
loos-br
Menu
▾
▴
msn-proxy-devel — Development and Troubleshooting - Desenvolvimento e problemas
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(45) |
Feb
(19) |
Mar
(21) |
Apr
(17) |
May
(43) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(17) |
Oct
(1) |
Nov
(4) |
Dec
(7) |
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
(1) |
Oct
|
Nov
(3) |
Dec
(4) |
| 2011 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(8) |
Jun
(19) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: aledr <mat...@gm...> - 2010-11-30 19:20:13
|
Olá! Tudo bem? Você não precisa executar o serviço no gateway da rede. Acredito que o problema seja que o tráfego da própria máquina com o msn-proxy está sendo redirecionada para ela também. Aí é só questão de ajustar isso na sua regra de redirecionamento colocando-a como exceção. 2010/11/29 edson santos oliveira <le...@gm...>: > Boa noite pessoal > > Então estou rodando o msn-proxy sem ser o gateway da rede, a partir de outra > maquina, o gateway da minha rede é um mikrotik com hotspot, tem como eu > redirecionar o trafego da porta 1863 para o meu server linux rodando > msn-proxy, pelo que eu entendi ele requer que vc rode ele na maquina gateway > da rede. Eu fiz o redirecionamento da porta 1863 para o mikrotik porém o > msn-proxy dá o erro de > > connected to [messenger.hotmail.com:1863] > debug: ns client disconnected > > sempre que tenta conectar > > Mais quando eu coloquei o linux como gateway da rede tudo funcionou > normalzinho. > > O que pode estar acontecendo de errado. > > Obrigado > Lien > > ------------------------------------------------------------------------------ > Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! > Tap into the largest installed PC base & get more eyes on your game by > optimizing for Intel(R) Graphics Technology. Get started today with the > Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. > http://p.sf.net/sfu/intelisp-dev2dev > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > -- [ ]'s Aledr - Alexandre "OpenSource Solutions for SmallBusiness Problems" |
|
From: edson s. o. <le...@gm...> - 2010-11-29 23:17:25
|
Boa noite pessoal Então estou rodando o msn-proxy sem ser o gateway da rede, a partir de outra maquina, o gateway da minha rede é um mikrotik com hotspot, tem como eu redirecionar o trafego da porta 1863 para o meu server linux rodando msn-proxy, pelo que eu entendi ele requer que vc rode ele na maquina gateway da rede. Eu fiz o redirecionamento da porta 1863 para o mikrotik porém o msn-proxy dá o erro de connected to [messenger.hotmail.com:1863] debug: ns client disconnected sempre que tenta conectar Mais quando eu coloquei o linux como gateway da rede tudo funcionou normalzinho. O que pode estar acontecendo de errado. Obrigado Lien |
|
From: William K. <wil...@ra...> - 2010-09-13 14:21:41
|
Bom dia a todos;
Estou tentando utilizar a ultima versao do SVN porem utilizo PGSQL e
notei que as mudancas desta versao so foram aplicadas para o MYSQL, estou
certo?
Se sim, existe previsao de que as mudancas sejam implementadas na versao
para PGSQL tambem?
abracos;
Em 15 de julho de 2010 22:50, Leonardo Duarte Rogoski
<leo...@gm...>escreveu:
> Olá lista.
>
> A versão que está no trunk do svn está em fase beta. No changelog
> podem ser consultadas as mudanças feitas.
> O suporte ao MSN Live Beta (MSNP 19, 20 e 21) será incluído no RC que
> sai dia 30. Nenhuma nova funcionalidade foi adicinada, nesse momento
> estamos buscando maior estabilidade.
> Algumas funcionalidades se tornaram obsoletas devido às mudanças que o
> protocolo sofreu e por isso serão removidas no RC.
>
> Aqueles que desejarem contribuir para o projeto com uma nova interface
> web, por favor enviem um e-mail para a lista ou postem no fórum o link
> (de preferência
> com alguns screenshots).
>
> Por favor, façam testes, qualquer problema encontrado, reportem.
>
> Obrigado.
>
> --
> Leonardo
>
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by Sprint
> What will you do first with EVO, the first 4G phone?
> Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
> _______________________________________________
> msn-proxy-devel mailing list
> msn...@li...
> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel
>
--
William A. Knob
Diretor de Desenvolvimento
Raidbr Solucoes em Informatica LTDA.
55 54 3204 7740 / 55 54 8119 2929
|
|
From: Leonardo D. R. <leo...@gm...> - 2010-07-16 01:50:20
|
Olá lista. A versão que está no trunk do svn está em fase beta. No changelog podem ser consultadas as mudanças feitas. O suporte ao MSN Live Beta (MSNP 19, 20 e 21) será incluído no RC que sai dia 30. Nenhuma nova funcionalidade foi adicinada, nesse momento estamos buscando maior estabilidade. Algumas funcionalidades se tornaram obsoletas devido às mudanças que o protocolo sofreu e por isso serão removidas no RC. Aqueles que desejarem contribuir para o projeto com uma nova interface web, por favor enviem um e-mail para a lista ou postem no fórum o link (de preferência com alguns screenshots). Por favor, façam testes, qualquer problema encontrado, reportem. Obrigado. -- Leonardo |
|
From: <leo...@us...> - 2010-07-16 01:49:37
|
Revision: 148
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=148&view=rev
Author: leorogoski
Date: 2010-07-16 01:49:31 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
- Mudan?\195?\167a dos campos contact_flags e contact_flags2.
- Corre?\195?\167?\195?\163o no parser dos e-mails dos contatos.
- Adicionado mais comandos que possuem payload.
- Mudan?\195?\167a na maneira de salvar os contatos.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure
trunk/configure.in
trunk/src/db_modules/mysql/php/fl.inc.php
trunk/src/db_modules/mysql/sql.c
trunk/src/db_modules/mysql/tables/contacts
trunk/src/msn-proxy/check-cmd.c
trunk/src/msn-proxy/command.c
trunk/src/msn-proxy/configure.h
trunk/src/msn-proxy/contacts-types.h
trunk/src/msn-proxy/contacts.c
trunk/src/msn-proxy/msg.c
trunk/src/msn-proxy/msn-proxy.h
trunk/src/msn-proxy/msnp18.h
trunk/src/msn-proxy/protocol.c
trunk/src/msn-proxy/protocol.h
trunk/src/msn-proxy/user.c
Added Paths:
-----------
trunk/UPDATING
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/ChangeLog 2010-07-16 01:49:31 UTC (rev 148)
@@ -1,3 +1,17 @@
+2010-07-15
+
+ - Mudança dos campos contact_flags e contact_flags2 para contact_capab
+ e contact_excapab respectivamente. Leia UPDATING
+
+ - Correção no parser dos e-mails dos contatos.
+
+ - Adicionado mais comandos que possuem payload.
+
+ - Mudança na maneira de salvar os contatos. Antes era feito quando recebia
+ o comando CHG, mas alguns clientes do MSN enviam esse comando antes de requisitar
+ a lista de contatos fazendo com que a lista de contatos não fosse inserida no banco
+ de dados. Com essa alteração o bloqueio dos contatos em tempo real "voltou" a funcionar.
+
2010-01-10
- Correcao de memory leaks.
@@ -10,7 +24,7 @@
- Adicionados indices em algumas tabelas do MySQL.
- 2009-03-15
+2009-03-15
- Varios memory leaks (pra n\xE3o dizer todos) foram corrigidos pelo Leonardo.
Added: trunk/UPDATING
===================================================================
--- trunk/UPDATING (rev 0)
+++ trunk/UPDATING 2010-07-16 01:49:31 UTC (rev 148)
@@ -0,0 +1,5 @@
+- Versão < 0.8 beta
+
+ - Para atualizar a tabela contacts do banco de dados execute as seguintes querys:
+ ALTER TABLE `contacts` CHANGE `contact_flags` `contact_capab` BIGINT( 20 ) NOT NULL
+ ALTER TABLE `contacts` CHANGE `contact_flags2` `contact_excapab` BIGINT( 20 ) NOT NULL
\ No newline at end of file
Modified: trunk/configure
===================================================================
--- trunk/configure 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/configure 2010-07-16 01:49:31 UTC (rev 148)
@@ -11996,7 +11996,7 @@
# Generic stuff
-CFLAGS="$CFLAGS -pipe -fno-builtin-log"
+CFLAGS="$CFLAGS -Wall -pipe -fno-builtin-log"
# BSD
DEFAULT_INC_LDFLAGS="-L/usr/local/lib"
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/configure.in 2010-07-16 01:49:31 UTC (rev 148)
@@ -24,7 +24,7 @@
want_pgsql=no)
# Generic stuff
-CFLAGS="$CFLAGS -pipe -fno-builtin-log"
+CFLAGS="$CFLAGS -Wall -pipe -fno-builtin-log"
# BSD
DEFAULT_INC_LDFLAGS="-L/usr/local/lib"
Modified: trunk/src/db_modules/mysql/php/fl.inc.php
===================================================================
--- trunk/src/db_modules/mysql/php/fl.inc.php 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/db_modules/mysql/php/fl.inc.php 2010-07-16 01:49:31 UTC (rev 148)
@@ -88,7 +88,7 @@
</table></p>
<div id="conectados" style="DISPLAY: ">
<?php
- $sql = "SELECT *, contact_flags & 0x10 AS contact_cam ";
+ $sql = "SELECT *, contact_capab & 0x10 AS contact_cam ";
$sql .= "FROM contacts WHERE email = '".$_REQUEST['email']."' ";
$sql .= "AND contact_lists & 1 AND contact_status != 'OFF' ";
$sql .= "ORDER BY contact_dn, contact_status";
@@ -152,7 +152,7 @@
<td width="10">S</td></tr></table>
<?php
}
- $sql = "SELECT *, contact_flags & 0x10 AS contact_cam FROM contacts ";
+ $sql = "SELECT *, contact_capab & 0x10 AS contact_cam FROM contacts ";
$sql .= "WHERE email = '".$_REQUEST['email']."' ";
$sql .= "AND contact_lists & 1 AND contact_status = 'OFF' ";
$sql .= "ORDER BY contact_dn, contact_status";
Modified: trunk/src/db_modules/mysql/sql.c
===================================================================
--- trunk/src/db_modules/mysql/sql.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/db_modules/mysql/sql.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -576,7 +576,7 @@
sql_insert_contact(string *email, struct contact_ *contact) {
char fmt[] = "INSERT INTO contacts (email, contact_uid, "
"contact_email, contact_lists, contact_dn, "
- "contact_group, contact_flags, contact_flags2, "
+ "contact_group, contact_capab, contact_excapab, "
"contact_deny "
") VALUES ("
"'%q', '%q', '%q', %d, '%q', '%q', '%l', '%l', '%d')";
@@ -588,14 +588,14 @@
contact->c.s, contact->lists,
contact->dn.len > 0 ? contact->dn.s : (unsigned char *)"",
contact->group.len > 0 ? contact->group.s : (unsigned char *)"",
- contact->flags, contact->flags2, contact->deny);
+ contact->capab, contact->excapab, contact->deny);
if (str_ready(&sql, sql.len + 1) == 0) die_nomem();
sql.len = fmt_printf(sql.s, fmt, email->s,
contact->uid.len > 0 ? contact->uid.s : (unsigned char *)"",
contact->c.s, contact->lists,
contact->dn.len > 0 ? contact->dn.s : (unsigned char *)"",
contact->group.len > 0 ? contact->group.s : (unsigned char *)"",
- contact->flags, contact->flags2, contact->deny);
+ contact->capab, contact->excapab, contact->deny);
if (db_query2(&mysql, &sql) == RFAIL) {
str_free(&sql);
@@ -673,17 +673,17 @@
contact->deny = contact->save->deny;
sql_int_data(&sql, len, "contact_deny", contact->deny);
}
- if (contact->save->flags > 0 &&
- contact->flags != contact->save->flags) {
+ if (contact->save->capab > 0 &&
+ contact->capab != contact->save->capab) {
- contact->flags = contact->save->flags;
- sql_lint_data(&sql, len, "contact_flags", contact->flags);
+ contact->capab = contact->save->capab;
+ sql_lint_data(&sql, len, "contact_capab", contact->capab);
}
- if (contact->save->flags2 > 0 &&
- contact->flags2 != contact->save->flags2) {
+ if (contact->save->excapab > 0 &&
+ contact->excapab != contact->save->excapab) {
- contact->flags2 = contact->save->flags2;
- sql_lint_data(&sql, len, "contact_flags2", contact->flags2);
+ contact->excapab = contact->save->excapab;
+ sql_lint_data(&sql, len, "contact_excapab", contact->excapab);
}
if (contact->save->lists > 0 &&
contact->lists != contact->save->lists) {
@@ -898,8 +898,8 @@
int
sql_contact_load(struct user_ *user, struct contact_ *contact) {
char fmt[] = "SELECT contact_email, contact_dn, contact_uid, "
- "contact_status, contact_info, contact_flags, "
- "contact_flags2, contact_lists, contact_deny "
+ "contact_status, contact_info, contact_capab, "
+ "contact_excapab, contact_lists, contact_deny "
"contact_chat "
"FROM contacts WHERE email = '%q' AND "
"contact_email = '%q'";
@@ -936,8 +936,8 @@
if (row[4] && strlen(row[4]) > 0) /* contact_info */
if (str_copys(&contact->info, (unsigned char *)row[4]) == 0) die_nomem();
- contact->flags = row[5] ? atoll(row[5]) : 0; /* flags */
- contact->flags2 = row[6] ? atoll(row[6]) : 0; /* flags2 */
+ contact->capab = row[5] ? atoll(row[5]) : 0; /* capab */
+ contact->excapab = row[6] ? atoll(row[6]) : 0; /* excapab */
contact->lists = row[7] ? atol(row[7]) : 0; /* lists */
contact->deny = row[8] ? atol(row[8]) : 0; /* deny */
@@ -951,8 +951,8 @@
int
sql_contact_load_all(struct user_ *user) {
char fmt[] = "SELECT contact_email, contact_dn, contact_uid, "
- "contact_status, contact_info, contact_flags, "
- "contact_flags2, contact_lists, contact_deny "
+ "contact_status, contact_info, contact_capab, "
+ "contact_excapab, contact_lists, contact_deny "
"contact_chat "
"FROM contacts WHERE email = '%q'";
struct contact_ *contact;
@@ -993,8 +993,8 @@
if (row[4] && strlen(row[4]) > 0) /* contact_info */
if (str_copys(&contact->info, (unsigned char *)row[4]) == 0) die_nomem();
- contact->flags = row[5] ? atoll(row[5]) : 0; /* flags */
- contact->flags2 = row[6] ? atoll(row[6]) : 0; /* flags2 */
+ contact->capab = row[5] ? atoll(row[5]) : 0; /* capab */
+ contact->excapab = row[6] ? atoll(row[6]) : 0; /* excapab */
contact->lists = row[7] ? atol(row[7]) : 0; /* lists */
contact->deny = row[8] ? atol(row[8]) : 0; /* deny */
Modified: trunk/src/db_modules/mysql/tables/contacts
===================================================================
--- trunk/src/db_modules/mysql/tables/contacts 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/db_modules/mysql/tables/contacts 2010-07-16 01:49:31 UTC (rev 148)
@@ -9,8 +9,8 @@
'LUN', 'HDN', 'OFF')
NOT NULL DEFAULT 'OFF',
`contact_lists` int NOT NULL DEFAULT 0,
- `contact_flags` bigint NOT NULL DEFAULT 0,
- `contact_flags2` bigint NOT NULL DEFAULT 0,
+ `contact_capab` bigint NOT NULL DEFAULT 0,
+ `contact_excapab` bigint NOT NULL DEFAULT 0,
`contact_group` VARCHAR(255) NOT NULL DEFAULT '',
`contact_info` VARCHAR(255) NOT NULL DEFAULT '',
`contact_media` VARCHAR(255) NOT NULL DEFAULT '',
Modified: trunk/src/msn-proxy/check-cmd.c
===================================================================
--- trunk/src/msn-proxy/check-cmd.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/check-cmd.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -74,12 +74,9 @@
/* dispatch command */
for ( ; (cmds && cmds->cmd); cmds++) {
- /* XXX - remove */
- //io_printf(1, "%S: [%S] == [%s]\n", label, cmds->cmd, &cmd->cmd);
if (strncmp(cmds->cmd, (char *)cmd->cmd.s, cmd->cmd.len) == 0) {
- //print_command(cmd);
- if (cmds->func != NULL)
- return(cmds->func(user, cmd));
+ if (cmds->func != NULL)
+ return(cmds->func(user, cmd));
break;
}
}
Modified: trunk/src/msn-proxy/command.c
===================================================================
--- trunk/src/msn-proxy/command.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/command.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -83,7 +83,8 @@
strcasecmp((char *)cmd->cmd.s, "UBX") != 0 &&
strcasecmp((char *)cmd->cmd.s, "UUM") != 0 &&
strcasecmp((char *)cmd->cmd.s, "UUN") != 0 &&
- strcasecmp((char *)cmd->cmd.s, "UUX") != 0) {
+ strcasecmp((char *)cmd->cmd.s, "UUX") != 0 &&
+ strcasecmp((char *)cmd->cmd.s, "SDG") != 0) {
return(0);
}
Modified: trunk/src/msn-proxy/configure.h
===================================================================
--- trunk/src/msn-proxy/configure.h 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/configure.h 2010-07-16 01:49:31 UTC (rev 148)
@@ -18,8 +18,8 @@
* $Id: configure.h 137 2009-09-01 11:23:43Z loos-br $
*/
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef CONFIGURE_H
+#define CONFIGURE_H
#include <sys/types.h>
#include <sys/time.h>
Modified: trunk/src/msn-proxy/contacts-types.h
===================================================================
--- trunk/src/msn-proxy/contacts-types.h 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/contacts-types.h 2010-07-16 01:49:31 UTC (rev 148)
@@ -38,8 +38,8 @@
unsigned int deny; /* commands and data */
unsigned int lists; /* lists information */
struct contact_ *save; /* update data */
- unsigned long long flags; /* client flags */
- unsigned long long flags2; /* client flags */
+ unsigned long long capab; /* client capab */
+ unsigned long long excapab; /* client excapab */
};
struct contacts {
Modified: trunk/src/msn-proxy/contacts.c
===================================================================
--- trunk/src/msn-proxy/contacts.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/contacts.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -89,8 +89,8 @@
log->debug("debug contact: info: [%s]\n", &contact->info);
- log->debug("debug contact: flags: ");
- msn_print_cap(contact->flags, contact->flags2);
+ log->debug("debug contact: capab: ");
+ msn_print_cap(contact->capab, contact->excapab);
log->debug("debug contact: lists: ");
msn_print_lists(contact->lists);
@@ -153,28 +153,13 @@
struct contact_ *contact;
struct contact_ *save;
struct contact_ find;
- unsigned int len = 0;
- unsigned int end = 0;
if (c == NULL || c->len == 0)
return(NULL);
/* find contact in db if exist */
memset(&find, 0, sizeof (struct contact_));
- c->p = (unsigned char *)strchr((char *)c->s, ':');
- if (c->p)
- len = ++c->p - c->s;
-
- /* UBX */
- c->p = (unsigned char *)strchr((char *)c->s, ';');
- if (c->p)
- end = c->len - (c->p - c->s);
-
- if (len > 0 && len < c->len) {
- if (str_copy(&find.c, c->s + len, (c->len - len - end)) == 0) die_nomem();
- } else {
- if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
- }
+ msn_tok_epdata(c, &find.c);
contact = RB_FIND(contacts, &user->contacts, &find);
contact_free(&find);
@@ -182,11 +167,7 @@
contact = (struct contact_ *)malloc(sizeof(struct contact_));
if (contact == NULL) die_nomem();
memset(contact, 0, sizeof (struct contact_));
- if (len > 0 && len < c->len) {
- if (str_copy(&contact->c, c->s + len, c->len - len) == 0) die_nomem();
- } else {
- if (str_copy(&contact->c, c->s, c->len) == 0) die_nomem();
- }
+ if (str_copy(&contact->c, c->s, c->len) == 0) die_nomem();
RB_INSERT(contacts, &user->contacts, contact);
contact->chat = NO;
contact->updated = NEW;
@@ -309,6 +290,12 @@
xml_free(&xml_tag_head);
user->contact_delete = 1;
+
+ if (db.sql_contact_save_all(user) == RFAIL) {
+ log->debug("debug: cannot save contacts\n");
+ return(RFAIL);
+ }
+
return(ROK);
}
@@ -537,7 +524,7 @@
}
memset(&find, 0, sizeof (struct contact_));
- if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
+ msn_tok_epdata(c, &find.c);
contact = RB_FIND(contacts, &user->contacts, &find);
contact_free(&find);
@@ -554,14 +541,14 @@
contact->save = NULL;
return(ROK);
}
- if (c->len > 0 && str_copy(&save->c, c->s, c->len) == 0)
- die_nomem();
+
+ msn_tok_epdata(c, &save->c);
o = get_arg(cmd, 6);
if (o && o->len > 0 && str_copy(&save->o, o->s, o->len) == 0)
die_nomem();
if (s->len > 0 && str_copy(&save->status, s->s, s->len) == 0)
die_nomem();
- save->flags = (get_arg(cmd, 5) == NULL) ? 0 : atoll((char *)cmd->args[5]->s);
+ save->capab = (get_arg(cmd, 5) == NULL) ? 0 : atoll((char *)cmd->args[5]->s);
/* check for blocked contacts */
if (save->deny & CONTACT_DENY)
@@ -639,7 +626,7 @@
die_nomem();
if (s->len > 0 && str_copy(&save->status, s->s, s->len) == 0)
die_nomem();
- save->flags = (get_arg(cmd, 4) == NULL) ? 0 : atoll((char *)cmd->args[4]->s);
+ save->capab = (get_arg(cmd, 4) == NULL) ? 0 : atoll((char *)cmd->args[4]->s);
/* check for blocked contacts */
if (save->deny & CONTACT_DENY)
@@ -668,7 +655,6 @@
struct contact_ *contact;
struct contact_ *save;
struct contact_ find;
- unsigned int len;
string *c;
if (cmd->args_len < 1)
@@ -679,27 +665,15 @@
return(ROK);
/* find contact in db if exist */
- memset(&find, 0, sizeof (struct contact_));
- if (user->version == MSNP18 && c->len > 0) {
- c->p = (unsigned char *)strchr((char *)c->s, ':');
- if (c->p) {
- len = c->p - c->s;
- if (c->len > ++len)
- if (str_copy(&find.c, c->s + len, c->len - len) == 0) die_nomem();
- } else
- goto error;
- } else {
- if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
- }
+ memset(& find, 0, sizeof (struct contact_));
+ msn_tok_epdata(c, &find.c);
+
contact = RB_FIND(contacts, &user->contacts, &find);
contact_free(&find);
- if (contact == NULL)
+ if (contact == NULL || cmd->ignore)
return(ROK);
- if (cmd->ignore)
- return(ROK);
-
save = contact_update(user, &contact->c);
if (save == NULL)
return(ROK);
@@ -712,7 +686,6 @@
if (contact->deny & CONTACT_DENY)
return(RETURN);
-error:
return(ROK);
}
@@ -721,15 +694,13 @@
struct contact_ *contact;
struct contact_ *save;
struct contact_ find;
- unsigned int len = 0;
- string *c; /* contato */
- string *d; /* texto nome */
+ string *c; /* contact */
+ string *d; /* display name */
string *o; /* object */
string *s; /* status */
char *ep;
char *f;
-
if (cmd->args_len < 5)
return(ROK);
@@ -742,14 +713,7 @@
}
memset(&find, 0, sizeof (struct contact_));
- c->p = (unsigned char *)strchr((char *)c->s, ':');
- if (c->p)
- len = ++c->p - c->s;
- if (len > 0 && len < c->len) {
- if (str_copy(&find.c, c->s + len, c->len - len) == 0) die_nomem();
- } else {
- if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
- }
+ msn_tok_epdata(c, &find.c);
contact = RB_FIND(contacts, &user->contacts, &find);
contact_free(&find);
@@ -774,9 +738,9 @@
die_nomem();
f = (get_arg(cmd, 3) == NULL) ? "" : (char *)cmd->args[3]->s;
- save->flags = strtoul(f, &ep, 10);
+ save->capab = strtoul(f, &ep, 10);
if (ep && *ep == ':')
- save->flags2 = atol(++ep);
+ save->excapab = atol(++ep);
/* check for blocked contacts */
if (save->deny & CONTACT_DENY)
@@ -818,7 +782,7 @@
}
memset(&find, 0, sizeof (struct contact_));
- if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
+ msn_tok_epdata(c, &find.c);
contact = RB_FIND(contacts, &user->contacts, &find);
contact_free(&find);
@@ -842,7 +806,7 @@
die_nomem();
if (s->len > 0 && str_copy(&save->status, s->s, s->len) == 0)
die_nomem();
- save->flags = (get_arg(cmd, 4) == NULL) ? 0 : atoll((char *)cmd->args[4]->s);
+ save->capab = (get_arg(cmd, 4) == NULL) ? 0 : atoll((char *)cmd->args[4]->s);
/* check for blocked contacts */
if (save->deny & CONTACT_DENY)
@@ -896,7 +860,7 @@
}
memset(&find, 0, sizeof (struct contact_));
- if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
+ msn_tok_epdata(c, &find.c);
contact = RB_FIND(contacts, &user->contacts, &find);
contact_free(&find);
@@ -920,7 +884,7 @@
die_nomem();
if (s->len > 0 && str_copy(&save->status, s->s, s->len) == 0)
die_nomem();
- save->flags = (get_arg(cmd, 3) == NULL) ? 0 : atoll((char *)cmd->args[3]->s);
+ save->capab = (get_arg(cmd, 3) == NULL) ? 0 : atoll((char *)cmd->args[3]->s);
/* check for blocked contacts */
if (save->deny & CONTACT_DENY)
Modified: trunk/src/msn-proxy/msg.c
===================================================================
--- trunk/src/msn-proxy/msg.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/msg.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -252,6 +252,10 @@
switch (msn_msg_type(&msg)) {
case TYPE_TEXTUTF8:
+
+ if(cmd->ignore) {
+ return(ROK);
+ }
if ((user->commands & CHAT)) {
msg_free(&msg);
Modified: trunk/src/msn-proxy/msn-proxy.h
===================================================================
--- trunk/src/msn-proxy/msn-proxy.h 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/msn-proxy.h 2010-07-16 01:49:31 UTC (rev 148)
@@ -86,7 +86,7 @@
#define P2P_FILE 0x00002000
#ifndef MSNPROXY_VERSION
-#define MSNPROXY_VERSION "0.8-alpha"
+#define MSNPROXY_VERSION "0.8-beta"
#endif
#ifndef MSNPROXY_RELEASE
Modified: trunk/src/msn-proxy/msnp18.h
===================================================================
--- trunk/src/msn-proxy/msnp18.h 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/msnp18.h 2010-07-16 01:49:31 UTC (rev 148)
@@ -22,7 +22,6 @@
CMD SERVER_MSNP18_PRE_CMDS[] = {
{ "USR", server_msnp12_pre_usr },
- { "VER", msn_get_ver },
{ "XFR", xfr_proxy },
{ NULL, NULL }
};
@@ -47,7 +46,6 @@
CMD CLIENT_MSNP18_PRE_CMDS[] = {
{ "USR", client_msn_pre_usr },
- { "VER", msn_get_ver },
{ NULL, NULL }
};
Modified: trunk/src/msn-proxy/protocol.c
===================================================================
--- trunk/src/msn-proxy/protocol.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/protocol.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -507,168 +507,168 @@
}
void
-msn_print_cap(unsigned int flags, unsigned int flags2) {
+msn_print_cap(unsigned int capab, unsigned int excapab) {
int space = 0;
- if (flags == 0 && flags2 == 0) {
+ if (capab == 0 && excapab == 0) {
log->debug("\n");
return;
}
log->debug("<");
- if (flags & MOBILE) {
+ if (capab & MOBILE) {
log->debug("MOBILE"); space++;
}
- if (flags & IE8) {
+ if (capab & IE8) {
if (space > 0) log->debug(" "); else space++;
log->debug("IE8"); space++;
}
- if (flags & GIFINK) {
+ if (capab & GIFINK) {
if (space > 0) log->debug(" "); else space++;
log->debug("GIFINK"); space++;
}
- if (flags & ISFINK) {
+ if (capab & ISFINK) {
if (space > 0) log->debug(" "); else space++;
log->debug("ISFINK"); space++;
}
- if (flags & WEBCAM) {
+ if (capab & WEBCAM) {
if (space > 0) log->debug(" "); else space++;
log->debug("WEBCAM"); space++;
}
- if (flags & MULTIM) {
+ if (capab & MULTIM) {
if (space > 0) log->debug(" "); else space++;
log->debug("MULTIM"); space++;
}
- if (flags & MOBILEDEV) {
+ if (capab & MOBILEDEV) {
if (space > 0) log->debug(" "); else space++;
log->debug("MOBILEDEV"); space++;
}
- if (flags & DIRECT) {
+ if (capab & DIRECT) {
if (space > 0) log->debug(" "); else space++;
log->debug("DIRECT"); space++;
}
- if (flags & WEBCLIENT) {
+ if (capab & WEBCLIENT) {
if (space > 0) log->debug(" "); else space++;
log->debug("WEBCLIENT"); space++;
}
- if (flags & ICLIENT) {
+ if (capab & ICLIENT) {
if (space > 0) log->debug(" "); else space++;
log->debug("ICLIENT"); space++;
}
- if (flags & HAVESPACE) {
+ if (capab & HAVESPACE) {
if (space > 0) log->debug(" "); else space++;
log->debug("HAVESPACE"); space++;
}
- if (flags & XPMEDIAC) {
+ if (capab & XPMEDIAC) {
if (space > 0) log->debug(" "); else space++;
log->debug("XPMEDIAC"); space++;
}
- if (flags & DIRECTIM) {
+ if (capab & DIRECTIM) {
if (space > 0) log->debug(" "); else space++;
log->debug("DIRECTIM"); space++;
}
- if (flags & WINKS) {
+ if (capab & WINKS) {
if (space > 0) log->debug(" "); else space++;
log->debug("WINKS"); space++;
}
- if (flags & SEARCH) {
+ if (capab & SEARCH) {
if (space > 0) log->debug(" "); else space++;
log->debug("SEARCH"); space++;
}
- if (flags & BOT) {
+ if (capab & BOT) {
if (space > 0) log->debug(" "); else space++;
log->debug("BOT"); space++;
}
- if (flags & VOICECLIPS) {
+ if (capab & VOICECLIPS) {
if (space > 0) log->debug(" "); else space++;
log->debug("VOICECLIPS"); space++;
}
- if (flags & SSCHANNEL) {
+ if (capab & SSCHANNEL) {
if (space > 0) log->debug(" "); else space++;
log->debug("SSCHANNEL"); space++;
}
- if (flags & SIP) {
+ if (capab & SIP) {
if (space > 0) log->debug(" "); else space++;
log->debug("SIP"); space++;
}
- if (flags & TUNELEDSIP) {
+ if (capab & TUNELEDSIP) {
if (space > 0) log->debug(" "); else space++;
log->debug("TUNELEDSIP"); space++;
}
- if (flags & SHARINGFOLDERS) {
+ if (capab & SHARINGFOLDERS) {
if (space > 0) log->debug(" "); else space++;
log->debug("SHARINGFOLDERS"); space++;
}
- if (flags & ONECARE) {
+ if (capab & ONECARE) {
if (space > 0) log->debug(" "); else space++;
log->debug("ONECARE"); space++;
}
- if (flags & P2PTURN) {
+ if (capab & P2PTURN) {
if (space > 0) log->debug(" "); else space++;
log->debug("P2PTURN"); space++;
}
- if (flags & UUN) {
+ if (capab & UUN) {
if (space > 0) log->debug(" "); else space++;
log->debug("UUN"); space++;
}
- if ((flags & MSNC10) == MSNC10) {
+ if ((capab & MSNC10) == MSNC10) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC10"); space++;
goto end;
}
- if ((flags & MSNC9) == MSNC9) {
+ if ((capab & MSNC9) == MSNC9) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC9"); space++;
goto end;
}
- if ((flags & MSNC8) == MSNC8) {
+ if ((capab & MSNC8) == MSNC8) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC8"); space++;
goto end;
}
- if ((flags & MSNC7) == MSNC7) {
+ if ((capab & MSNC7) == MSNC7) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC7"); space++;
goto end;
}
- if ((flags & MSNC6) == MSNC6) {
+ if ((capab & MSNC6) == MSNC6) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC6"); space++;
goto end;
}
- if ((flags & MSNC5) == MSNC5) {
+ if ((capab & MSNC5) == MSNC5) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC5"); space++;
goto end;
}
- if ((flags & MSNC4) == MSNC4) {
+ if ((capab & MSNC4) == MSNC4) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC4"); space++;
goto end;
}
- if ((flags & MSNC3) == MSNC3) {
+ if ((capab & MSNC3) == MSNC3) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC3"); space++;
goto end;
}
- if ((flags & MSNC2) == MSNC2) {
+ if ((capab & MSNC2) == MSNC2) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC2"); space++;
goto end;
}
- if ((flags & MSNC1) == MSNC1) {
+ if ((capab & MSNC1) == MSNC1) {
if (space > 0) log->debug(" "); else space++;
log->debug("MSNC1"); space++;
goto end;
}
end:
- if (flags2 & RTCVIDEO) {
+ if (excapab & RTCVIDEO) {
if (space > 0) log->debug(" "); else space++;
log->debug("RTCVIDEO"); space++;
}
- if (flags2 & P2PV2) {
+ if (excapab & P2PV2) {
if (space > 0) log->debug(" "); else space++;
log->debug("P2PV2"); space++;
}
@@ -721,8 +721,8 @@
user->cmds = MSNP18_CMDS;
user->sbcmds = MSNP18_SBCMDS;
} else if (strncmp("MSNP17", (char *)arg->s, arg->len) == 0 ||
- strncmp("MSNP18", (char *)arg->s, arg->len) == 0) {
- user->version = MSNP18;
+ strncmp("MSNP18", (char *)arg->s, arg->len) == 0) {
+ user->version = MSNP18;
user->cmds = MSNP18_CMDS;
user->sbcmds = MSNP18_SBCMDS;
} else
@@ -738,7 +738,7 @@
case MSNP12: return("MSNP12");
case MSNP13: return("MSNP13");
case MSNP15: return("MSNP15");
- case MSNP18: return("MSNP18");
+ case MSNP18: return("MSNP18");
}
return("");
}
@@ -1088,6 +1088,9 @@
if (str_ready(arg, arg->len + 1) == 0) die_nomem();
arg->len = fmt_printf(arg->s, "%d", cmd->payload.len);
+ /* don't insert in database */
+ cmd->ignore = 1;
+
/* add command to queue */
commands_add_command(&sb->server->commands, cmd);
client_sched_write(sb->client);
@@ -1157,6 +1160,9 @@
if (str_ready(arg, arg->len + 1) == 0) die_nomem();
arg->len = fmt_printf(arg->s, "%d", cmd->payload.len);
+ /* don't insert in database */
+ cmd->ignore = 1;
+
/* add command to queue */
commands_add_command(&sb->client->commands, cmd);
server_sched_write(sb->server);
@@ -1274,16 +1280,16 @@
}
str_free(&dn);
- /* flags */
+ /* capab */
arg = command_add_arg(cmd);
if (user->version == MSNP18) {
- arg->len = fmt_printf(NULL, "%l:%l", contact->flags, contact->flags2);
+ arg->len = fmt_printf(NULL, "%l:%l", contact->capab, contact->excapab);
if (str_ready(arg, arg->len + 1) == 0) die_nomem();
- arg->len = fmt_printf(arg->s, "%l:%l", contact->flags, contact->flags2);
+ arg->len = fmt_printf(arg->s, "%l:%l", contact->capab, contact->excapab);
} else {
- arg->len = fmt_printf(NULL, "%l", contact->flags);
+ arg->len = fmt_printf(NULL, "%l", contact->capab);
if (str_ready(arg, arg->len + 1) == 0) die_nomem();
- arg->len = fmt_printf(arg->s, "%l", contact->flags);
+ arg->len = fmt_printf(arg->s, "%l", contact->capab);
}
/* obj */
@@ -1359,19 +1365,21 @@
void
msn_tok_epdata(string *str, string *out) {
+ unsigned int start= 0;
+ unsigned int end = 0;
if (str == NULL || str->len == 0) return;
+ str->p = (unsigned char *)strchr((char *)str->s, ':');
+ if (str->p) {
+ str->p++;
+ start = str->p - str->s;
+ }
+
str->p = (unsigned char *)strchr((char *)str->s, ';');
- if (str->p != NULL && str->p > str->s && str->p - str->s < str->len - 1) {
+ if (str->p) {
+ end = str->len - (str->p - str->s);
+ }
- if ((size_t)(str->p - str->s) > 0 &&
- str_copy(out, str->s, (size_t)(str->p - str->s)) == 0) {
- die_nomem();
- }
- } else {
-
- if (str->len > 0 && str_copy(out, str->s, str->len) == 0)
- die_nomem();
- }
+ if (str_copy(out, str->s + start, (str->len - start - end)) == 0) die_nomem();
}
Modified: trunk/src/msn-proxy/protocol.h
===================================================================
--- trunk/src/msn-proxy/protocol.h 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/protocol.h 2010-07-16 01:49:31 UTC (rev 148)
@@ -78,7 +78,7 @@
int msn_decode_friendly(string *in, string *out);
int msn_decode_obj(struct msn_obj_ *obj);
void msn_print_lists(unsigned int lists);
-void msn_print_cap(unsigned int flags, unsigned int flags2);
+void msn_print_cap(unsigned int capab, unsigned int excapab);
string *get_arg(command *cmd, int narg);
int check_arg(string *arg, char *cmp);
int msn_get_ver(struct user_ *user, command *cmd);
Modified: trunk/src/msn-proxy/user.c
===================================================================
--- trunk/src/msn-proxy/user.c 2010-04-28 18:13:23 UTC (rev 147)
+++ trunk/src/msn-proxy/user.c 2010-07-16 01:49:31 UTC (rev 148)
@@ -87,10 +87,10 @@
}
/* update contact information */
- if (db.sql_contact_save_all(user) == RFAIL) {
- log->debug("debug: cannot save contacts\n");
- return(RFAIL);
- }
+ //if (db.sql_contact_save_all(user) == RFAIL) {
+ //log->debug("debug: cannot save contacts\n");
+ //return(RFAIL);
+ //}
/* check img acl */
if ( (user->commands & USEIMG) && cmd->args_len == 4 && o) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <leo...@us...> - 2010-04-28 18:13:29
|
Revision: 147
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=147&view=rev
Author: leorogoski
Date: 2010-04-28 18:13:23 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
- Fix in parse of UBX command.
- Fix in configuration file path.
Modified Paths:
--------------
trunk/src/msn-proxy/configure.h
trunk/src/msn-proxy/contacts.c
Modified: trunk/src/msn-proxy/configure.h
===================================================================
--- trunk/src/msn-proxy/configure.h 2010-01-11 13:09:13 UTC (rev 146)
+++ trunk/src/msn-proxy/configure.h 2010-04-28 18:13:23 UTC (rev 147)
@@ -33,7 +33,7 @@
#endif
#ifndef DEFAULT_CONFIG_FILE
-#define DEFAULT_CONFIG_FILE "/usr/local/etc/msn-proxy.conf"
+#define DEFAULT_CONFIG_FILE "/usr/local/etc/msn-proxy/msn-proxy.conf"
#endif
struct confkey_ {
Modified: trunk/src/msn-proxy/contacts.c
===================================================================
--- trunk/src/msn-proxy/contacts.c 2010-01-11 13:09:13 UTC (rev 146)
+++ trunk/src/msn-proxy/contacts.c 2010-04-28 18:13:23 UTC (rev 147)
@@ -154,6 +154,7 @@
struct contact_ *save;
struct contact_ find;
unsigned int len = 0;
+ unsigned int end = 0;
if (c == NULL || c->len == 0)
return(NULL);
@@ -162,10 +163,15 @@
memset(&find, 0, sizeof (struct contact_));
c->p = (unsigned char *)strchr((char *)c->s, ':');
if (c->p)
- len = ++c->p - c->s;
+ len = ++c->p - c->s;
+ /* UBX */
+ c->p = (unsigned char *)strchr((char *)c->s, ';');
+ if (c->p)
+ end = c->len - (c->p - c->s);
+
if (len > 0 && len < c->len) {
- if (str_copy(&find.c, c->s + len, c->len - len) == 0) die_nomem();
+ if (str_copy(&find.c, c->s + len, (c->len - len - end)) == 0) die_nomem();
} else {
if (str_copy(&find.c, c->s, c->len) == 0) die_nomem();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <leo...@us...> - 2010-01-11 13:09:52
|
Revision: 146
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=146&view=rev
Author: leorogoski
Date: 2010-01-11 13:09:13 +0000 (Mon, 11 Jan 2010)
Log Message:
-----------
- Correcao de memory leaks.
- Alteracao nos paths dos arquivos de configuracao.
- Migracao para o autotools finalizada.
- Alteracao no nome do bin?\195?\161rio para msn_proxy (compatibilidade com o autotools).
- Adicionados indices em algumas tabelas do MySQL.
Modified Paths:
--------------
trunk/ChangeLog
trunk/INSTALL
trunk/config.h.in
trunk/configure
trunk/configure.in
trunk/src/db_modules/mysql/Makefile.am
trunk/src/db_modules/mysql/Makefile.in
trunk/src/db_modules/mysql/tables/contact_groups
trunk/src/db_modules/mysql/tables/contacts
trunk/src/db_modules/mysql/tables/defaults
trunk/src/db_modules/mysql/tables/log
trunk/src/db_modules/mysql/tables/sb
trunk/src/db_modules/mysql/tables/users
trunk/src/db_modules/pgsql/Makefile.am
trunk/src/db_modules/pgsql/Makefile.in
trunk/src/msn-proxy/Makefile.am
trunk/src/msn-proxy/Makefile.in
trunk/src/msn-proxy/msn-proxy.conf
trunk/src/msn-proxy/sb.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/ChangeLog 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,5 +1,17 @@
-2009-03-15
+2010-01-10
+ - Correcao de memory leaks.
+
+ - Alteracao nos paths dos arquivos de configuracao.
+
+ - Migracao para o autotools finalizada.
+
+ - Alteracao no nome do bin\xE1rio para msn_proxy (compatibilidade com o autotools).
+
+ - Adicionados indices em algumas tabelas do MySQL.
+
+ 2009-03-15
+
- Varios memory leaks (pra n\xE3o dizer todos) foram corrigidos pelo Leonardo.
- Corrigido a visualiza\xE7\xE3o de cameras nos contatos.
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/INSTALL 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,16 +1,18 @@
Simple install instructions
-download, compile and install libevent: http://monkey.org/~provos/libevent/
+Download, compile and install libevent: http://monkey.org/~provos/libevent/
-download, compile and install mysql (only libmysqlclient is used).
+Download, compile and install mysql/postgresql (only libmysqlclient/libpq is used).
Uncompress the msn-proxy:
# tar -zxvf msn-proxy.tar.gz
# cd msn-proxy
-Edit the Makefile as you need (edit mysql includes and libs).
+Execute configure:
+# configure --with-mysql (or --with-pgsql)
+
Compile the msn-proxy:
# make
@@ -20,7 +22,7 @@
# make install
Edit the files in /usr/local/etc/msn-proxy, specially msn-proxy.conf and
-mysql/conf
+the database config file (example: mysql/conf).
Look at msn-proxy.conf the maximum allowed proxy clients (the default is
a pretty low - 10 simultaneous connections).
@@ -33,7 +35,7 @@
Pay attention at "`" and "'" differences on mysql commands.
At first run, msn-proxy will check and create the mysql tables, after that
-insert the default configuration (with your real proxy ip):
+insert the default configuration (with your real proxy IP):
> insert into defaults (internal_host) values ('192.168.0.1');
Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/config.h.in 2010-01-11 13:09:13 UTC (rev 146)
@@ -102,9 +102,6 @@
*/
#undef LT_OBJDIR
-/* Mysql Config Dir */
-#undef MYSQLCONFDIR
-
/* Name of package */
#undef PACKAGE
@@ -123,9 +120,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* PGSql Config Dir */
-#undef PGSQLCONFDIR
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
Modified: trunk/configure
===================================================================
--- trunk/configure 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/configure 2010-01-11 13:09:13 UTC (rev 146)
@@ -911,8 +911,8 @@
enable_option_checking
enable_maintainer_mode
enable_dependency_tracking
-enable_shared
enable_static
+enable_shared
with_pic
enable_fast_install
with_gnu_ld
@@ -1563,8 +1563,8 @@
(and sometimes confusing) to the casual installer
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+ --enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
@@ -5136,6 +5136,37 @@
fi
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_static=no
+fi
+
+
+
+
+
+
+
+
+
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -5704,13 +5735,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5707: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5738: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5710: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5741: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5713: output\"" >&5)
+ (eval echo "\"\$as_me:5744: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6915,7 +6946,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6918 "configure"' > conftest.$ac_ext
+ echo '#line 6949 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7898,38 +7929,8 @@
- # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_static=yes
-fi
-
-
-
-
-
-
-
-
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then
withval=$with_pic; pic_mode="$withval"
@@ -8353,11 +8354,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8356: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8357: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8360: \$? = $ac_status" >&5
+ echo "$as_me:8361: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8692,11 +8693,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8695: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8696: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8699: \$? = $ac_status" >&5
+ echo "$as_me:8700: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8797,11 +8798,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8800: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8801: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8804: \$? = $ac_status" >&5
+ echo "$as_me:8805: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8852,11 +8853,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8859: \$? = $ac_status" >&5
+ echo "$as_me:8860: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11652,7 +11653,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11655 "configure"
+#line 11656 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11748,7 +11749,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11751 "configure"
+#line 11752 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11981,7 +11982,7 @@
if test "${with_mysql+set}" = set; then
withval=$with_mysql; want_mysql=yes
else
- want_mysql=no
+ want_mysql=yes
fi
@@ -13790,7 +13791,6 @@
done
-
if test $want_mysql != no; then
# based on code from PHP
for i in /usr /usr/local /usr/local/mysql; do
@@ -14045,13 +14045,6 @@
fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define MYSQLCONFDIR "$sysconfdir/$PACKAGE_NAME/mysql"
-_ACEOF
-
-
fi
if test $want_pgsql != no; then
@@ -14310,12 +14303,6 @@
fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define PGSQLCONFDIR "$sysconfdir/$PACKAGE_NAME/pgsql"
-_ACEOF
-
fi
if test "$want_mysql" = "yes"; then
@@ -15001,10 +14988,10 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
@@ -16107,6 +16094,9 @@
# ### BEGIN LIBTOOL CONFIG
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
@@ -16114,9 +16104,6 @@
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
# What type of objects to build.
pic_mode=$pic_mode
@@ -16731,9 +16718,16 @@
fi
-echo
-echo "Host OS .................: $host_os"
-echo "Install prefix ..........: $prefix"
-echo "Config Directory.........: $sysconfdir"
-echo "MySQL DB support.........: $want_mysql"
-echo "PgSQL DB support.........: $want_pgsql"
+{ $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
+{ $as_echo "$as_me:$LINENO: result: Host OS .................: $host_os" >&5
+$as_echo "Host OS .................: $host_os" >&6; }
+{ $as_echo "$as_me:$LINENO: result: Install prefix ..........: $prefix" >&5
+$as_echo "Install prefix ..........: $prefix" >&6; }
+{ $as_echo "$as_me:$LINENO: result: Config Directory.........: $sysconfdir" >&5
+$as_echo "Config Directory.........: $sysconfdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: MySQL DB support.........: $want_mysql" >&5
+$as_echo "MySQL DB support.........: $want_mysql" >&6; }
+{ $as_echo "$as_me:$LINENO: result: PgSQL DB support.........: $want_pgsql" >&5
+$as_echo "PgSQL DB support.........: $want_pgsql" >&6; }
+
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/configure.in 2010-01-11 13:09:13 UTC (rev 146)
@@ -10,12 +10,13 @@
AC_HEADER_STDC
AC_C_INLINE
AC_PROG_CC
+AM_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_ARG_WITH(mysql,
[ --with-mysql Build with MySQL driver support],
want_mysql=yes,
- want_mysql=no)
+ want_mysql=yes)
AC_ARG_WITH(pgsql,
[ --with-pgsql Build with PgSQL driver support],
@@ -66,7 +67,6 @@
AC_FUNC_REALLOC
AC_CHECK_FUNCS([fchdir memset socket strcasecmp strchr strerror strncasecmp strtol strtoul])
-
if test $want_mysql != no; then
# based on code from PHP
for i in /usr /usr/local /usr/local/mysql; do
@@ -109,9 +109,6 @@
AC_ERROR([Can't build with MySQL support: libmysqlclient not found])
fi
])
-
- AC_DEFINE_UNQUOTED(MYSQLCONFDIR, "$sysconfdir/$PACKAGE_NAME/mysql", Mysql Config Dir)
-
fi
if test $want_pgsql != no; then
@@ -158,8 +155,6 @@
AC_ERROR([Can't build with PostgreSQL support: libpq not found])
fi
])
-
- AC_DEFINE_UNQUOTED(PGSQLCONFDIR, "$sysconfdir/$PACKAGE_NAME/pgsql", PGSql Config Dir)
fi
AM_CONDITIONAL(BUILD_MYSQL, test "$want_mysql" = "yes")
@@ -182,9 +177,10 @@
AC_OUTPUT
-echo
-echo "Host OS .................: $host_os"
-echo "Install prefix ..........: $prefix"
-echo "Config Directory.........: $sysconfdir"
-echo "MySQL DB support.........: $want_mysql"
-echo "PgSQL DB support.........: $want_pgsql"
+AC_MSG_RESULT([])
+AC_MSG_RESULT([Host OS .................: $host_os])
+AC_MSG_RESULT([Install prefix ..........: $prefix])
+AC_MSG_RESULT([Config Directory.........: $sysconfdir])
+AC_MSG_RESULT([MySQL DB support.........: $want_mysql])
+AC_MSG_RESULT([PgSQL DB support.........: $want_pgsql])
+
Modified: trunk/src/db_modules/mysql/Makefile.am
===================================================================
--- trunk/src/db_modules/mysql/Makefile.am 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/Makefile.am 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,30 +1,46 @@
-pkglibdir = $(libdir)/@PACKAGE_NAME@/mysql
if BUILD_MYSQL
-pkglib_LTLIBRARIES = mysql.la
+
+moduledir = $(libdir)/@PACKAGE_NAME@/
+
+confdir = \
+ @sysconfdir@/@PACKAGE_NAME@/mysql/
+
mysql_la_LDFLAGS = -module -avoid-version
-mysql_la_LIBADD = $(MYSQL_LIBS)
-mysql_la_CPPFLAGS = $(MYSQL_CFLAGS)
-confdir = @sysconfdir@/@PACKAGE_NAME@/mysql
-conf_DATA = conf
+module_LTLIBRARIES = \
+ mysql.la
-tabledir = $(confdir)/tables
-table_DATA = tables/contact_groups \
- tables/contacts \
- tables/defaults \
- tables/log \
- tables/sb \
- tables/users
+mysql_la_LIBADD = \
+ $(MYSQL_LIBS)
-EXTRA_DIST = $(conf_DATA) \
- $(table_DATA)
+mysql_la_CPPFLAGS = \
+ $(MYSQL_CFLAGS) \
+ -DMYSQLCONFDIR='"$(confdir)"'
+
+conf_DATA = \
+ conf
+
+tabledir = \
+ $(confdir)/tables/
+
+table_DATA = \
+ tables/contact_groups \
+ tables/contacts \
+ tables/defaults \
+ tables/log \
+ tables/sb \
+ tables/users
+
+EXTRA_DIST = \
+ $(conf_DATA) \
+ $(table_DATA)
mysql_la_SOURCES = \
- mysql.c \
- sql.c
+ mysql.c \
+ sql.c
noinst_HEADERS = \
- mysql.h \
- sql.h
+ mysql.h \
+ sql.h
endif
\ No newline at end of file
Modified: trunk/src/db_modules/mysql/Makefile.in
===================================================================
--- trunk/src/db_modules/mysql/Makefile.in 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/Makefile.in 2010-01-11 13:09:13 UTC (rev 146)
@@ -20,6 +20,7 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
@@ -67,9 +68,9 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(confdir)" \
+am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(confdir)" \
"$(DESTDIR)$(tabledir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(module_LTLIBRARIES)
am__DEPENDENCIES_1 =
@BUILD_MYSQL_TRUE@mysql_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__mysql_la_SOURCES_DIST = mysql.c sql.c
@@ -79,7 +80,7 @@
mysql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mysql_la_LDFLAGS) \
$(LDFLAGS) -o $@
-@BUILD_MYSQL_TRUE@am_mysql_la_rpath = -rpath $(pkglibdir)
+@BUILD_MYSQL_TRUE@am_mysql_la_rpath = -rpath $(moduledir)
DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -101,7 +102,6 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibdir = $(libdir)/@PACKAGE_NAME@/mysql
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -218,30 +218,46 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@BUILD_MYSQL_TRUE@pkglib_LTLIBRARIES = mysql.la
+@BUILD_MYSQL_TRUE@moduledir = $(libdir)/@PACKAGE_NAME@/
+@BUILD_MYSQL_TRUE@confdir = \
+@BUILD_MYSQL_TRUE@ @sysconfdir@/@PACKAGE_NAME@/mysql/
+
@BUILD_MYSQL_TRUE@mysql_la_LDFLAGS = -module -avoid-version
-@BUILD_MYSQL_TRUE@mysql_la_LIBADD = $(MYSQL_LIBS)
-@BUILD_MYSQL_TRUE@mysql_la_CPPFLAGS = $(MYSQL_CFLAGS)
-@BUILD_MYSQL_TRUE@confdir = @sysconfdir@/@PACKAGE_NAME@/mysql
-@BUILD_MYSQL_TRUE@conf_DATA = conf
-@BUILD_MYSQL_TRUE@tabledir = $(confdir)/tables
-@BUILD_MYSQL_TRUE@table_DATA = tables/contact_groups \
-@BUILD_MYSQL_TRUE@ tables/contacts \
-@BUILD_MYSQL_TRUE@ tables/defaults \
-@BUILD_MYSQL_TRUE@ tables/log \
-@BUILD_MYSQL_TRUE@ tables/sb \
-@BUILD_MYSQL_TRUE@ tables/users
+@BUILD_MYSQL_TRUE@module_LTLIBRARIES = \
+@BUILD_MYSQL_TRUE@ mysql.la
-@BUILD_MYSQL_TRUE@EXTRA_DIST = $(conf_DATA) \
-@BUILD_MYSQL_TRUE@ $(table_DATA)
+@BUILD_MYSQL_TRUE@mysql_la_LIBADD = \
+@BUILD_MYSQL_TRUE@ $(MYSQL_LIBS)
+@BUILD_MYSQL_TRUE@mysql_la_CPPFLAGS = \
+@BUILD_MYSQL_TRUE@ $(MYSQL_CFLAGS) \
+@BUILD_MYSQL_TRUE@ -DMYSQLCONFDIR='"$(confdir)"'
+
+@BUILD_MYSQL_TRUE@conf_DATA = \
+@BUILD_MYSQL_TRUE@ conf
+
+@BUILD_MYSQL_TRUE@tabledir = \
+@BUILD_MYSQL_TRUE@ $(confdir)/tables/
+
+@BUILD_MYSQL_TRUE@table_DATA = \
+@BUILD_MYSQL_TRUE@ tables/contact_groups \
+@BUILD_MYSQL_TRUE@ tables/contacts \
+@BUILD_MYSQL_TRUE@ tables/defaults \
+@BUILD_MYSQL_TRUE@ tables/log \
+@BUILD_MYSQL_TRUE@ tables/sb \
+@BUILD_MYSQL_TRUE@ tables/users
+
+@BUILD_MYSQL_TRUE@EXTRA_DIST = \
+@BUILD_MYSQL_TRUE@ $(conf_DATA) \
+@BUILD_MYSQL_TRUE@ $(table_DATA)
+
@BUILD_MYSQL_TRUE@mysql_la_SOURCES = \
-@BUILD_MYSQL_TRUE@ mysql.c \
-@BUILD_MYSQL_TRUE@ sql.c
+@BUILD_MYSQL_TRUE@ mysql.c \
+@BUILD_MYSQL_TRUE@ sql.c
@BUILD_MYSQL_TRUE@noinst_HEADERS = \
-@BUILD_MYSQL_TRUE@ mysql.h \
-@BUILD_MYSQL_TRUE@ sql.h
+@BUILD_MYSQL_TRUE@ mysql.h \
+@BUILD_MYSQL_TRUE@ sql.h
all: all-am
@@ -277,32 +293,32 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
list2="$$list2 $$p"; \
else :; fi; \
done; \
test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
}
-uninstall-pkglibLTLIBRARIES:
+uninstall-moduleLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
for p in $$list; do \
$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
done
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+clean-moduleLTLIBRARIES:
+ -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
@@ -487,7 +503,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(tabledir)"; do \
+ for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(tabledir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -517,7 +533,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -538,13 +554,14 @@
info-am:
-install-data-am: install-confDATA install-tableDATA
+install-data-am: install-confDATA install-moduleLTLIBRARIES \
+ install-tableDATA
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-pkglibLTLIBRARIES
+install-exec-am:
install-html: install-html-am
@@ -584,25 +601,25 @@
ps-am:
-uninstall-am: uninstall-confDATA uninstall-pkglibLTLIBRARIES \
+uninstall-am: uninstall-confDATA uninstall-moduleLTLIBRARIES \
uninstall-tableDATA
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+ clean-libtool clean-moduleLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-confDATA install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-info-am install-man install-moduleLTLIBRARIES \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip install-tableDATA installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-confDATA uninstall-pkglibLTLIBRARIES \
+ uninstall-am uninstall-confDATA uninstall-moduleLTLIBRARIES \
uninstall-tableDATA
Modified: trunk/src/db_modules/mysql/tables/contact_groups
===================================================================
--- trunk/src/db_modules/mysql/tables/contact_groups 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/tables/contact_groups 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,7 +1,6 @@
CREATE TABLE `%q` (
- `email` varchar(255) not null,
- `name` varchar(255) not null,
- `id` varchar(255) not null,
- primary key(`email`, `name`)
-)
-
+ `email` VARCHAR(255) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
+ `id` VARCHAR(255) NOT NULL,
+ PRIMARY KEY(`email`, `name`)
+)ENGINE=InnoDB
\ No newline at end of file
Modified: trunk/src/db_modules/mysql/tables/contacts
===================================================================
--- trunk/src/db_modules/mysql/tables/contacts 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/tables/contacts 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,21 +1,21 @@
CREATE TABLE `%q` (
- `email` varchar(255) not null,
- `contact_email` varchar(255) not null default '',
- `contact_dn` varchar(255) not null default '',
- `contact_deny` int unsigned not null default 0,
- `contact_chat` enum('NO', 'YES') not null default 'NO',
- `contact_status` enum('NLN', 'BSY', 'IDL',
+ `email` VARCHAR(255) NOT NULL,
+ `contact_email` VARCHAR(255) NOT NULL DEFAULT '',
+ `contact_dn` VARCHAR(255) NOT NULL DEFAULT '',
+ `contact_deny` int UNSIGNED NOT NULL DEFAULT 0,
+ `contact_chat` ENUM('NO', 'YES') NOT NULL DEFAULT 'NO',
+ `contact_status` ENUM('NLN', 'BSY', 'IDL',
'BRB', 'AWY', 'PHN',
'LUN', 'HDN', 'OFF')
- not null default 'OFF',
- `contact_lists` int not null default 0,
- `contact_flags` bigint not null default 0,
- `contact_flags2` bigint not null default 0,
- `contact_group` varchar(255) not null default '',
- `contact_info` varchar(255) not null default '',
- `contact_media` varchar(255) not null default '',
- `contact_uid` varchar(255) not null default '0',
- `contact_obj` text not null default '',
- `contact_image` binary not null,
- primary key(`email`, `contact_email`)
-)
+ NOT NULL DEFAULT 'OFF',
+ `contact_lists` int NOT NULL DEFAULT 0,
+ `contact_flags` bigint NOT NULL DEFAULT 0,
+ `contact_flags2` bigint NOT NULL DEFAULT 0,
+ `contact_group` VARCHAR(255) NOT NULL DEFAULT '',
+ `contact_info` VARCHAR(255) NOT NULL DEFAULT '',
+ `contact_media` VARCHAR(255) NOT NULL DEFAULT '',
+ `contact_uid` VARCHAR(255) NOT NULL DEFAULT '0',
+ `contact_obj` text NOT NULL DEFAULT '',
+ `contact_image` binary NOT NULL,
+ PRIMARY KEY(`email`, `contact_email`)
+)ENGINE=InnoDB
\ No newline at end of file
Modified: trunk/src/db_modules/mysql/tables/defaults
===================================================================
--- trunk/src/db_modules/mysql/tables/defaults 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/tables/defaults 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,12 +1,12 @@
CREATE TABLE `%q` (
- `internal_host` varchar(128) not null,
- `connect` enum('YES', 'NO') not null default 'YES',
- `save_msg` enum('YES', 'NO') not null default 'YES',
- `save_contacts` enum('YES', 'NO') not null default 'YES',
- `commands` int not null default 0,
- `warnemail` varchar(128) not null default 'adm...@me...',
- `warndn` varchar(255) not null default 'MSN-Proxy - Administrador do Sistema',
- `warnmsg` varchar(255) not null default 'Para sua seguran\xE7a esta mensagem esta sendo monitorada.',
- `msgfont` varchar(128) not null default 'Arial',
- `msgcolor` varchar(128) not null default 'black'
-)
+ `internal_host` VARCHAR(128) NOT NULL,
+ `connect` ENUM('YES', 'NO') NOT NULL DEFAULT 'YES',
+ `save_msg` ENUM('YES', 'NO') NOT NULL DEFAULT 'YES',
+ `save_contacts` ENUM('YES', 'NO') NOT NULL DEFAULT 'YES',
+ `commands` INT NOT NULL DEFAULT 0,
+ `warnemail` VARCHAR(128) NOT NULL DEFAULT 'adm...@me...',
+ `warndn` VARCHAR(255) NOT NULL DEFAULT 'MSN-Proxy - Administrador do Sistema',
+ `warnmsg` VARCHAR(255) NOT NULL DEFAULT 'Para sua seguranca esta mensagem esta sendo monitorada.',
+ `msgfont` VARCHAR(128) NOT NULL DEFAULT 'Arial',
+ `msgcolor` VARCHAR(128) NOT NULL DEFAULT 'black'
+)ENGINE=InnoDB
\ No newline at end of file
Modified: trunk/src/db_modules/mysql/tables/log
===================================================================
--- trunk/src/db_modules/mysql/tables/log 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/tables/log 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,11 +1,13 @@
CREATE TABLE `%q` (
- `id` int unsigned not null auto_increment,
- `sb_id` int not null,
- `date` datetime not null,
- `email` varchar(255) not null default '',
- `display_name` varchar(255) not null default '',
- `to` text not null default '',
- `type` varchar(50) not null default 'unknown',
- `content` text not null default '',
- primary key(`id`)
-)
+ `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+ `sb_id` INT NOT NULL,
+ `date` DATETIME NOT NULL,
+ `email` VARCHAR(255) NOT NULL DEFAULT '',
+ `display_name` VARCHAR(255) NOT NULL DEFAULT '',
+ `to` TEXT NOT NULL DEFAULT '',
+ `type` VARCHAR(50) NOT NULL DEFAULT 'unknown',
+ `content` TEXT NOT NULL DEFAULT '',
+ PRIMARY KEY(`id`),
+ INDEX `sb_id` (`sb_id` ASC),
+ INDEX `email` (`email` ASC)
+)ENGINE=InnoDB
\ No newline at end of file
Modified: trunk/src/db_modules/mysql/tables/sb
===================================================================
--- trunk/src/db_modules/mysql/tables/sb 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/tables/sb 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,7 +1,6 @@
CREATE TABLE `%q` (
- `id` int not null auto_increment,
- `email` varchar(255) not null,
- `since` datetime not null,
- primary key(`id`, `email`)
-)
-
+ `id` INT NOT NULL auto_increment,
+ `email` VARCHAR(255) NOT NULL,
+ `since` DATETIME NOT NULL,
+ PRIMARY KEY(`id`, `email`)
+)ENGINE=MyISAM
\ No newline at end of file
Modified: trunk/src/db_modules/mysql/tables/users
===================================================================
--- trunk/src/db_modules/mysql/tables/users 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/mysql/tables/users 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,15 +1,15 @@
CREATE TABLE `%q` (
- `email` varchar(255) not null,
- `display_name` varchar(255) not null,
- `last_addr` varchar(255) not null,
- `last_seen` datetime not null,
- `connect` enum('YES', 'NO') not null default 'YES',
- `save_msg` enum('YES', 'NO') not null default 'YES',
- `save_contacts` enum('YES', 'NO') not null default 'YES',
- `commands` int not null default 0,
- `status` enum('OFF', 'NLN', 'BSY', 'IDL',
+ `email` VARCHAR(255) NOT NULL,
+ `display_name` VARCHAR(255) NOT NULL,
+ `last_addr` VARCHAR(255) NOT NULL,
+ `last_seen` DATETIME NOT NULL,
+ `connect` ENUM('YES', 'NO') NOT NULL DEFAULT 'YES',
+ `save_msg` ENUM('YES', 'NO') NOT NULL DEFAULT 'YES',
+ `save_contacts` ENUM('YES', 'NO') NOT NULL DEFAULT 'YES',
+ `commands` INT NOT NULL DEFAULT 0,
+ `status` ENUM('OFF', 'NLN', 'BSY', 'IDL',
'BRB', 'AWY', 'PHN',
'LUN', 'HDN')
- not null default 'OFF',
- primary key(`email`)
-)
+ NOT NULL DEFAULT 'OFF',
+ PRIMARY KEY(`email`)
+)ENGINE=InnoDB
\ No newline at end of file
Modified: trunk/src/db_modules/pgsql/Makefile.am
===================================================================
--- trunk/src/db_modules/pgsql/Makefile.am 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/pgsql/Makefile.am 2010-01-11 13:09:13 UTC (rev 146)
@@ -1,30 +1,46 @@
-pkglibdir = $(libdir)/@PACKAGE_NAME@/pgsql
if BUILD_PGSQL
-pkglib_LTLIBRARIES = pgsql.la
+
+moduledir = $(libdir)/@PACKAGE_NAME@/
+
+confdir = \
+ @sysconfdir@/@PACKAGE_NAME@/pgsql/
+
pgsql_la_LDFLAGS = -module -avoid-version
-pgsql_la_LIBADD = $(PGSQL_LIBS)
-pgsql_la_CPPFLAGS = $(PGSQL_CFLAGS)
-confdir = @sysconfdir@/@PACKAGE_NAME@/pgsql
-conf_DATA = conf
+module_LTLIBRARIES = \
+ pgsql.la
-tabledir = $(confdir)/tables
-table_DATA = tables/contact_groups \
- tables/contacts \
- tables/defaults \
- tables/log \
- tables/sb \
- tables/users
+pgsql_la_LIBADD = \
+ $(PGSQL_LIBS)
-EXTRA_DIST = $(conf_DATA) \
- $(table_DATA)
+pgsql_la_CPPFLAGS = \
+ $(PGSQL_CFLAGS) \
+ -DPGSQLCONFDIR='"$(confdir)"'
+conf_DATA = \
+ conf
+
+tabledir = \
+ $(confdir)/tables/
+
+table_DATA = \
+ tables/contact_groups \
+ tables/contacts \
+ tables/defaults \
+ tables/log \
+ tables/sb \
+ tables/users
+
+EXTRA_DIST = \
+ $(conf_DATA) \
+ $(table_DATA)
+
pgsql_la_SOURCES = \
- pgsql.c \
- sql.c
+ pgsql.c \
+ sql.c
noinst_HEADERS = \
- pgsql.h \
- sql.h
+ pgsql.h \
+ sql.h
-endif
+endif
Modified: trunk/src/db_modules/pgsql/Makefile.in
===================================================================
--- trunk/src/db_modules/pgsql/Makefile.in 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/db_modules/pgsql/Makefile.in 2010-01-11 13:09:13 UTC (rev 146)
@@ -20,6 +20,7 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
@@ -67,9 +68,9 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(confdir)" \
+am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(confdir)" \
"$(DESTDIR)$(tabledir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
+LTLIBRARIES = $(module_LTLIBRARIES)
am__DEPENDENCIES_1 =
@BUILD_PGSQL_TRUE@pgsql_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__pgsql_la_SOURCES_DIST = pgsql.c sql.c
@@ -79,7 +80,7 @@
pgsql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(pgsql_la_LDFLAGS) \
$(LDFLAGS) -o $@
-@BUILD_PGSQL_TRUE@am_pgsql_la_rpath = -rpath $(pkglibdir)
+@BUILD_PGSQL_TRUE@am_pgsql_la_rpath = -rpath $(moduledir)
DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -101,7 +102,6 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibdir = $(libdir)/@PACKAGE_NAME@/pgsql
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -218,30 +218,46 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@BUILD_PGSQL_TRUE@pkglib_LTLIBRARIES = pgsql.la
+@BUILD_PGSQL_TRUE@moduledir = $(libdir)/@PACKAGE_NAME@/
+@BUILD_PGSQL_TRUE@confdir = \
+@BUILD_PGSQL_TRUE@ @sysconfdir@/@PACKAGE_NAME@/pgsql/
+
@BUILD_PGSQL_TRUE@pgsql_la_LDFLAGS = -module -avoid-version
-@BUILD_PGSQL_TRUE@pgsql_la_LIBADD = $(PGSQL_LIBS)
-@BUILD_PGSQL_TRUE@pgsql_la_CPPFLAGS = $(PGSQL_CFLAGS)
-@BUILD_PGSQL_TRUE@confdir = @sysconfdir@/@PACKAGE_NAME@/pgsql
-@BUILD_PGSQL_TRUE@conf_DATA = conf
-@BUILD_PGSQL_TRUE@tabledir = $(confdir)/tables
-@BUILD_PGSQL_TRUE@table_DATA = tables/contact_groups \
-@BUILD_PGSQL_TRUE@ tables/contacts \
-@BUILD_PGSQL_TRUE@ tables/defaults \
-@BUILD_PGSQL_TRUE@ tables/log \
-@BUILD_PGSQL_TRUE@ tables/sb \
-@BUILD_PGSQL_TRUE@ tables/users
+@BUILD_PGSQL_TRUE@module_LTLIBRARIES = \
+@BUILD_PGSQL_TRUE@ pgsql.la
-@BUILD_PGSQL_TRUE@EXTRA_DIST = $(conf_DATA) \
-@BUILD_PGSQL_TRUE@ $(table_DATA)
+@BUILD_PGSQL_TRUE@pgsql_la_LIBADD = \
+@BUILD_PGSQL_TRUE@ $(PGSQL_LIBS)
+@BUILD_PGSQL_TRUE@pgsql_la_CPPFLAGS = \
+@BUILD_PGSQL_TRUE@ $(PGSQL_CFLAGS) \
+@BUILD_PGSQL_TRUE@ -DPGSQLCONFDIR='"$(confdir)"'
+
+@BUILD_PGSQL_TRUE@conf_DATA = \
+@BUILD_PGSQL_TRUE@ conf
+
+@BUILD_PGSQL_TRUE@tabledir = \
+@BUILD_PGSQL_TRUE@ $(confdir)/tables/
+
+@BUILD_PGSQL_TRUE@table_DATA = \
+@BUILD_PGSQL_TRUE@ tables/contact_groups \
+@BUILD_PGSQL_TRUE@ tables/contacts \
+@BUILD_PGSQL_TRUE@ tables/defaults \
+@BUILD_PGSQL_TRUE@ tables/log \
+@BUILD_PGSQL_TRUE@ tables/sb \
+@BUILD_PGSQL_TRUE@ tables/users
+
+@BUILD_PGSQL_TRUE@EXTRA_DIST = \
+@BUILD_PGSQL_TRUE@ $(conf_DATA) \
+@BUILD_PGSQL_TRUE@ $(table_DATA)
+
@BUILD_PGSQL_TRUE@pgsql_la_SOURCES = \
-@BUILD_PGSQL_TRUE@ pgsql.c \
-@BUILD_PGSQL_TRUE@ sql.c
+@BUILD_PGSQL_TRUE@ pgsql.c \
+@BUILD_PGSQL_TRUE@ sql.c
@BUILD_PGSQL_TRUE@noinst_HEADERS = \
-@BUILD_PGSQL_TRUE@ pgsql.h \
-@BUILD_PGSQL_TRUE@ sql.h
+@BUILD_PGSQL_TRUE@ pgsql.h \
+@BUILD_PGSQL_TRUE@ sql.h
all: all-am
@@ -277,32 +293,32 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
list2="$$list2 $$p"; \
else :; fi; \
done; \
test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
}
-uninstall-pkglibLTLIBRARIES:
+uninstall-moduleLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
for p in $$list; do \
$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
done
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+clean-moduleLTLIBRARIES:
+ -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
@@ -487,7 +503,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(tabledir)"; do \
+ for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(tabledir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -517,7 +533,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -538,13 +554,14 @@
info-am:
-install-data-am: install-confDATA install-tableDATA
+install-data-am: install-confDATA install-moduleLTLIBRARIES \
+ install-tableDATA
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-pkglibLTLIBRARIES
+install-exec-am:
install-html: install-html-am
@@ -584,25 +601,25 @@
ps-am:
-uninstall-am: uninstall-confDATA uninstall-pkglibLTLIBRARIES \
+uninstall-am: uninstall-confDATA uninstall-moduleLTLIBRARIES \
uninstall-tableDATA
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+ clean-libtool clean-moduleLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-confDATA install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-info-am install-man install-moduleLTLIBRARIES \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip install-tableDATA installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-confDATA uninstall-pkglibLTLIBRARIES \
+ uninstall-am uninstall-confDATA uninstall-moduleLTLIBRARIES \
uninstall-tableDATA
Modified: trunk/src/msn-proxy/Makefile.am
===================================================================
--- trunk/src/msn-proxy/Makefile.am 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/msn-proxy/Makefile.am 2010-01-11 13:09:13 UTC (rev 146)
@@ -4,11 +4,14 @@
msn_proxy_LDFLAGS = -export-dynamic
-confdir = @sysconfdir@/@PACKAGE_NAME@/
+confdir = \
+ @sysconfdir@/@PACKAGE_NAME@/
-conf_DATA = msn-proxy.conf
+conf_DATA = \
+ msn-proxy.conf
-EXTRA_DIST = $(conf_DATA)
+EXTRA_DIST = \
+ $(conf_DATA)
msn_proxy_SOURCES = \
base64.c \
Modified: trunk/src/msn-proxy/Makefile.in
===================================================================
--- trunk/src/msn-proxy/Makefile.in 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/msn-proxy/Makefile.in 2010-01-11 13:09:13 UTC (rev 146)
@@ -222,9 +222,15 @@
top_srcdir = @top_srcdir@
msn_proxy_LDADD = $(MSNPROXY_LIBS)
msn_proxy_LDFLAGS = -export-dynamic
-confdir = @sysconfdir@/@PACKAGE_NAME@/
-conf_DATA = msn-proxy.conf
-EXTRA_DIST = $(conf_DATA)
+confdir = \
+ @sysconfdir@/@PACKAGE_NAME@/
+
+conf_DATA = \
+ msn-proxy.conf
+
+EXTRA_DIST = \
+ $(conf_DATA)
+
msn_proxy_SOURCES = \
base64.c \
check-cmd.c \
Modified: trunk/src/msn-proxy/msn-proxy.conf
===================================================================
--- trunk/src/msn-proxy/msn-proxy.conf 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/msn-proxy/msn-proxy.conf 2010-01-11 13:09:13 UTC (rev 146)
@@ -37,6 +37,6 @@
# database module
#
# this is the path of the database module
-# db_mod=/usr/local/msn-proxy/mysql/mysql.so
-# db_mod=/usr/local/msn-proxy/pgsql/pgsql.so
-db_mod=/usr/local/msn-proxy/mysql/mysql.so
+# db_mod=/usr/local/lib/msn-proxy/mysql.so
+# db_mod=/usr/local/lib/msn-proxy/pgsql.so
+db_mod=/usr/local/lib/msn-proxy/mysql.so
Modified: trunk/src/msn-proxy/sb.c
===================================================================
--- trunk/src/msn-proxy/sb.c 2009-12-23 16:13:13 UTC (rev 145)
+++ trunk/src/msn-proxy/sb.c 2010-01-11 13:09:13 UTC (rev 146)
@@ -704,6 +704,7 @@
/* add contact email to this sb session */
(void) sb_user_alloc(sb, &passport);
+ str_free(&passport);
return(ROK);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <leo...@us...> - 2009-12-23 16:13:21
|
Revision: 145
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=145&view=rev
Author: leorogoski
Date: 2009-12-23 16:13:13 +0000 (Wed, 23 Dec 2009)
Log Message:
-----------
Correcao na funcao send_nln.
Modified Paths:
--------------
trunk/src/msn-proxy/protocol.c
Modified: trunk/src/msn-proxy/protocol.c
===================================================================
--- trunk/src/msn-proxy/protocol.c 2009-12-11 18:10:00 UTC (rev 144)
+++ trunk/src/msn-proxy/protocol.c 2009-12-23 16:13:13 UTC (rev 145)
@@ -1265,7 +1265,7 @@
/* display name */
arg = command_add_arg(cmd);
- (void)str_copys(arg, (unsigned char *)"");
+ (void)str_copys(arg, (unsigned char *)" ");
if (contact->dn.len > 0) {
str_zero(&dn);
(void)msn_encode(&contact->dn, &dn);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <leo...@us...> - 2009-12-11 18:10:10
|
Revision: 144
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=144&view=rev
Author: leorogoski
Date: 2009-12-11 18:10:00 +0000 (Fri, 11 Dec 2009)
Log Message:
-----------
Changing to autotools.
Added Paths:
-----------
trunk/AUTHORS
trunk/COPYING
trunk/Makefile.am
trunk/Makefile.in
trunk/NEWS
trunk/README
trunk/aclocal.m4
trunk/config.guess
trunk/config.h.in
trunk/config.sub
trunk/configure
trunk/configure.in
trunk/depcomp
trunk/install-sh
trunk/ltmain.sh
trunk/missing
trunk/src/
trunk/src/Makefile.am
trunk/src/Makefile.in
trunk/src/db_modules/
trunk/src/db_modules/mysql/
trunk/src/db_modules/mysql/Makefile.am
trunk/src/db_modules/mysql/Makefile.in
trunk/src/db_modules/mysql/conf
trunk/src/db_modules/mysql/mysql.c
trunk/src/db_modules/mysql/mysql.h
trunk/src/db_modules/mysql/php/
trunk/src/db_modules/mysql/php/.htaccess
trunk/src/db_modules/mysql/php/chat-to.php
trunk/src/db_modules/mysql/php/chat.php
trunk/src/db_modules/mysql/php/class.ctl.php
trunk/src/db_modules/mysql/php/conf.php
trunk/src/db_modules/mysql/php/default.array.cmd.inc.php
trunk/src/db_modules/mysql/php/default.array.option.inc.php
trunk/src/db_modules/mysql/php/default.array.status.inc.php
trunk/src/db_modules/mysql/php/fl.inc.php
trunk/src/db_modules/mysql/php/group.inc.php
trunk/src/db_modules/mysql/php/header.inc.php
trunk/src/db_modules/mysql/php/imagens/
trunk/src/db_modules/mysql/php/imagens/ausente.gif
trunk/src/db_modules/mysql/php/imagens/block.gif
trunk/src/db_modules/mysql/php/imagens/notinlist.png
trunk/src/db_modules/mysql/php/imagens/ocupado.gif
trunk/src/db_modules/mysql/php/imagens/offline.gif
trunk/src/db_modules/mysql/php/imagens/online.gif
trunk/src/db_modules/mysql/php/imagens/send_im.gif
trunk/src/db_modules/mysql/php/imagens/webcam.png
trunk/src/db_modules/mysql/php/index.php
trunk/src/db_modules/mysql/php/js.inc.php
trunk/src/db_modules/mysql/php/lists.inc.php
trunk/src/db_modules/mysql/php/mysql.inc.php
trunk/src/db_modules/mysql/php/save_contact_op.php
trunk/src/db_modules/mysql/php/save_default_op.php
trunk/src/db_modules/mysql/php/save_msg.php
trunk/src/db_modules/mysql/php/save_user_op.php
trunk/src/db_modules/mysql/php/user.inc.php
trunk/src/db_modules/mysql/php/user.php
trunk/src/db_modules/mysql/php/view-to.php
trunk/src/db_modules/mysql/php/view.php
trunk/src/db_modules/mysql/sql.c
trunk/src/db_modules/mysql/sql.h
trunk/src/db_modules/mysql/tables/
trunk/src/db_modules/mysql/tables/contact_groups
trunk/src/db_modules/mysql/tables/contacts
trunk/src/db_modules/mysql/tables/defaults
trunk/src/db_modules/mysql/tables/log
trunk/src/db_modules/mysql/tables/sb
trunk/src/db_modules/mysql/tables/users
trunk/src/db_modules/pgsql/
trunk/src/db_modules/pgsql/Makefile.am
trunk/src/db_modules/pgsql/Makefile.in
trunk/src/db_modules/pgsql/conf
trunk/src/db_modules/pgsql/pgsql.c
trunk/src/db_modules/pgsql/pgsql.h
trunk/src/db_modules/pgsql/php/
trunk/src/db_modules/pgsql/php/ajax.inc.php
trunk/src/db_modules/pgsql/php/al.inc.php
trunk/src/db_modules/pgsql/php/bl.inc.php
trunk/src/db_modules/pgsql/php/chat-to.php
trunk/src/db_modules/pgsql/php/chat.php
trunk/src/db_modules/pgsql/php/class.ctl.php
trunk/src/db_modules/pgsql/php/conf.php
trunk/src/db_modules/pgsql/php/default.array.cmd.inc.php
trunk/src/db_modules/pgsql/php/default.array.option.inc.php
trunk/src/db_modules/pgsql/php/default.array.status.inc.php
trunk/src/db_modules/pgsql/php/fl.inc.php
trunk/src/db_modules/pgsql/php/group.inc.php
trunk/src/db_modules/pgsql/php/header.inc.php
trunk/src/db_modules/pgsql/php/imagens/
trunk/src/db_modules/pgsql/php/imagens/ausente.gif
trunk/src/db_modules/pgsql/php/imagens/block.gif
trunk/src/db_modules/pgsql/php/imagens/notinlist.png
trunk/src/db_modules/pgsql/php/imagens/ocupado.gif
trunk/src/db_modules/pgsql/php/imagens/offline.gif
trunk/src/db_modules/pgsql/php/imagens/online.gif
trunk/src/db_modules/pgsql/php/imagens/send_im.gif
trunk/src/db_modules/pgsql/php/imagens/webcam.png
trunk/src/db_modules/pgsql/php/index.php
trunk/src/db_modules/pgsql/php/pgsql.inc.php
trunk/src/db_modules/pgsql/php/save_contact_op.php
trunk/src/db_modules/pgsql/php/save_default_op.php
trunk/src/db_modules/pgsql/php/save_msg.php
trunk/src/db_modules/pgsql/php/save_user_op.php
trunk/src/db_modules/pgsql/php/user.inc.php
trunk/src/db_modules/pgsql/php/user.php
trunk/src/db_modules/pgsql/php/view-to.php
trunk/src/db_modules/pgsql/php/view.php
trunk/src/db_modules/pgsql/sql.c
trunk/src/db_modules/pgsql/sql.h
trunk/src/db_modules/pgsql/tables/
trunk/src/db_modules/pgsql/tables/contact_groups
trunk/src/db_modules/pgsql/tables/contacts
trunk/src/db_modules/pgsql/tables/defaults
trunk/src/db_modules/pgsql/tables/log
trunk/src/db_modules/pgsql/tables/sb
trunk/src/db_modules/pgsql/tables/users
trunk/src/msn-proxy/
trunk/src/msn-proxy/Makefile.am
trunk/src/msn-proxy/Makefile.in
trunk/src/msn-proxy/array_cmd.h
trunk/src/msn-proxy/base64.c
trunk/src/msn-proxy/base64.h
trunk/src/msn-proxy/check-cmd-types.h
trunk/src/msn-proxy/check-cmd.c
trunk/src/msn-proxy/check-cmd.h
trunk/src/msn-proxy/client-types.h
trunk/src/msn-proxy/client.c
trunk/src/msn-proxy/client.h
trunk/src/msn-proxy/command-types.h
trunk/src/msn-proxy/command.c
trunk/src/msn-proxy/command.h
trunk/src/msn-proxy/configure.c
trunk/src/msn-proxy/configure.h
trunk/src/msn-proxy/contacts-types.h
trunk/src/msn-proxy/contacts.c
trunk/src/msn-proxy/contacts.h
trunk/src/msn-proxy/ctl.c
trunk/src/msn-proxy/ctl.h
trunk/src/msn-proxy/db.c
trunk/src/msn-proxy/db.h
trunk/src/msn-proxy/event.c
trunk/src/msn-proxy/event.h
trunk/src/msn-proxy/fmt.c
trunk/src/msn-proxy/fmt.h
trunk/src/msn-proxy/io.c
trunk/src/msn-proxy/io.h
trunk/src/msn-proxy/msg.c
trunk/src/msn-proxy/msg.h
trunk/src/msn-proxy/msn-proxy.c
trunk/src/msn-proxy/msn-proxy.conf
trunk/src/msn-proxy/msn-proxy.h
trunk/src/msn-proxy/msnp12.h
trunk/src/msn-proxy/msnp18.h
trunk/src/msn-proxy/msnp8.h
trunk/src/msn-proxy/net-io.c
trunk/src/msn-proxy/net-io.h
trunk/src/msn-proxy/ns-types.h
trunk/src/msn-proxy/ns.c
trunk/src/msn-proxy/ns.h
trunk/src/msn-proxy/obj-types.h
trunk/src/msn-proxy/p2p.c
trunk/src/msn-proxy/p2p.h
trunk/src/msn-proxy/protocol.c
trunk/src/msn-proxy/protocol.h
trunk/src/msn-proxy/queue.h
trunk/src/msn-proxy/return.h
trunk/src/msn-proxy/sb-types.h
trunk/src/msn-proxy/sb.c
trunk/src/msn-proxy/sb.h
trunk/src/msn-proxy/server-types.h
trunk/src/msn-proxy/server.c
trunk/src/msn-proxy/server.h
trunk/src/msn-proxy/sig.c
trunk/src/msn-proxy/sig.h
trunk/src/msn-proxy/string.c
trunk/src/msn-proxy/string.h
trunk/src/msn-proxy/syslog.c
trunk/src/msn-proxy/syslog.h
trunk/src/msn-proxy/tree.h
trunk/src/msn-proxy/user-types.h
trunk/src/msn-proxy/user.c
trunk/src/msn-proxy/user.h
trunk/src/msn-proxy/xml-types.h
trunk/src/msn-proxy/xml.c
trunk/src/msn-proxy/xml.h
Removed Paths:
-------------
trunk/Makefile
trunk/array_cmd.h
trunk/base64.c
trunk/base64.h
trunk/check-cmd-types.h
trunk/check-cmd.c
trunk/check-cmd.h
trunk/client-types.h
trunk/client.c
trunk/client.h
trunk/command-types.h
trunk/command.c
trunk/command.h
trunk/config.c
trunk/config.h
trunk/contacts-types.h
trunk/contacts.c
trunk/contacts.h
trunk/ctl.c
trunk/ctl.h
trunk/db.c
trunk/db.h
trunk/db_modules/
trunk/event.c
trunk/event.h
trunk/fmt.c
trunk/fmt.h
trunk/io.c
trunk/io.h
trunk/msg.c
trunk/msg.h
trunk/msn-proxy.c
trunk/msn-proxy.conf
trunk/msn-proxy.h
trunk/msnp12.h
trunk/msnp18.h
trunk/msnp8.h
trunk/net-io.c
trunk/net-io.h
trunk/ns-types.h
trunk/ns.c
trunk/ns.h
trunk/obj-types.h
trunk/p2p.c
trunk/p2p.h
trunk/protocol.c
trunk/protocol.h
trunk/queue.h
trunk/return.h
trunk/sb-types.h
trunk/sb.c
trunk/sb.h
trunk/server-types.h
trunk/server.c
trunk/server.h
trunk/sig.c
trunk/sig.h
trunk/string.c
trunk/string.h
trunk/syslog.c
trunk/syslog.h
trunk/tree.h
trunk/user-types.h
trunk/user.c
trunk/user.h
trunk/xml-types.h
trunk/xml.c
trunk/xml.h
Added: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS (rev 0)
+++ trunk/AUTHORS 2009-12-11 18:10:00 UTC (rev 144)
@@ -0,0 +1 @@
+Luiz Otavio Souza <lo...@gm...>
\ No newline at end of file
Deleted: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-12-08 17:17:54 UTC (rev 143)
+++ trunk/Makefile 2009-12-11 18:10:00 UTC (rev 144)
@@ -1,37 +0,0 @@
-
-RM=/bin/rm
-INSTALL=/usr/bin/install
-SYSCONFDIR=$(DESTDIR)/usr/local/etc
-BINDIR=$(DESTDIR)/usr/local/bin
-
-CCFLAGS=-g -Wall -O2 -pipe -I/usr/local/include -fno-builtin-log
-
-LDFLAGS=-L/usr/local/lib -levent -ldl
-
-OBJS=base64.o check-cmd.o client.o command.o config.o contacts.o ctl.o db.o \
- event.o fmt.o io.o msg.o msn-proxy.o ns.o net-io.o p2p.o protocol.o \
- sb.o sig.o server.o string.o syslog.o user.o xml.o
-
-INCLUDES=array_cmd.h base64.h check-cmd.h check-cmd-types.h client.h \
- client-types.h command.h command-types.h config.h contacts.h \
- contacts-types.h ctl.h db.h event.h fmt.h io.h msg.h msn-proxy.h \
- msnp8.h msnp12.h msnp18.h ns.h ns-types.h net-io.h obj-types.h \
- protocol.h return.h sb.h sig.h server.h server-types.h string.h \
- syslog.h sb-types.h user.h user-types.h xml.h xml-types.h
-
-all: msn-proxy
-
-msn-proxy: $(OBJS) $(INCLUDES)
- $(CC) -rdynamic -o msn-proxy $(OBJS) $(LDFLAGS)
-
-.c.o: $(INCLUDES)
- $(CC) $(CCFLAGS) -c $<
-
-clean:
- $(RM) -f *.o *.core msn-proxy
-
-install: all
- $(INSTALL) -d $(SYSCONFDIR)
- $(INSTALL) -b -m 644 msn-proxy.conf $(SYSCONFDIR)
- $(INSTALL) -d $(BINDIR)
- $(INSTALL) -s msn-proxy $(BINDIR)
Added: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am (rev 0)
+++ trunk/Makefile.am 2009-12-11 18:10:00 UTC (rev 144)
@@ -0,0 +1,2 @@
+SUBDIRS = \
+ src
Added: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in (rev 0)
+++ trunk/Makefile.in 2009-12-11 18:10:00 UTC (rev 144)
@@ -0,0 +1,719 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ config.guess config.sub depcomp install-sh ltmain.sh missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSNPROXY_LIBS = @MSNPROXY_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_LIBS = @MYSQL_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = \
+ src
+
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
+
+distclean-hdr:
+ -rm -f config.h stamp-h1
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool config.lt
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+ @$(am__cd) '$(distuninstallcheck_dir)' \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 (rev 0)
+++ trunk/aclocal.m4 2009-12-11 18:10:00 UTC (rev 144)
@@ -0,0 +1,8937 @@
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+ [m4_default([$3],
+ [m4_fatal([Libtool version $1 or higher is required],
+ 63)])],
+ [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+ *\ * | *\ *)
+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ _LT_PATH_MAGIC
+ fi
+ ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+ [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+ [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME. Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+ [m4_ifval([$1], [$1], [$2])])
+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+ m4_ifval([$4],
+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+ lt_dict_add_subkey([lt_decl_dict], [$2],
+ [tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+ [0], [m4_fatal([$0: too few arguments: $#])],
+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+ m4_if([$2], [],
+ m4_quote(lt_decl_varnames),
+ m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'. VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly. In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+# # Some comment about what VAR is for.
+# visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+ [description])))[]dnl
+m4_pushdef([_libtool_name],
+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+ [0], [_libtool_name=[$]$1],
+ [1], [_libtool_name=$lt_[]$1],
+ [2], [_libtool_name=$lt_[]$1],
+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'. Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+ dnl If the libtool generation code has been placed in $CONFIG_LT,
+ dnl instead of duplicating it all over again into config.status,
+ dnl then we will have config.status run $CONFIG_LT later, so it
+ dnl needs to know what name is stored there:
+ [AC_CONFIG_COMMANDS([libtool],
+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+ dnl If the libtool generation code is destined for config.status,
+ dnl expand the accumulated commands and init code now:
+ [AC_CONFIG_COMMANDS([libtool],
+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+ ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+ echo
+ AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+ -h, --help print this help, then exit
+ -V, --version print version number, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+
+Report bugs to <bug...@gn...>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+ case $[1] in
+ --version | --v* | -V )
+ echo "$lt_cl_version"; exit 0 ;;
+ --help | --h* | -h )
+ echo "$lt_cl_help"; exit 0 ;;
+ --debug | --d* | -d )
+ debug=: ;;
+ --quiet | --q* | --silent | --s* | -q )
+ lt_cl_silent=: ;;
+
+ -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+ *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+ esac
+ shift
+done
+
+if $lt_cl_silent; then
+ exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure. Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+ lt_cl_success=:
+ test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+ exec AS_MESSAGE_LOG_FD>>config.log
+ $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars. Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+ m4_if(_LT_TAG, [C], [
+ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+_LT_EOF
+ ;;
+ esac
+
+ _LT_PROG_LTMAIN
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ _LT_PROG_XSI_SHELLFNS
+
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+ [C], [_LT_LANG(C)],
+ [C++], [_LT_LANG(CXX)],
+ [Java], [_LT_LANG(GCJ)],
+ [Fortran 77], [_LT_LANG(F77)],
+ [Fortran], [_LT_LANG(FC)],
+ [Windows Resource], [_LT_LANG(RC)],
+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+ [_LT_LANG($1)],
+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+ [LT_SUPPORTED_TAG([$1])dnl
+ m4_append([_LT_TAGS], [$1 ])dnl
+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
+ _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [LT_LANG(CXX)],
+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [LT_LANG(F77)],
+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[L...
[truncated message content] |
|
From: <leo...@us...> - 2009-12-08 17:18:00
|
Revision: 143
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=143&view=rev
Author: leorogoski
Date: 2009-12-08 17:17:54 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Corrigido bug que fazia com que o parse do arquivo de configuracao nao fosse feito corretamente. (Thanks to Kelbert)
Modified Paths:
--------------
trunk/string.c
Modified: trunk/string.c
===================================================================
--- trunk/string.c 2009-12-03 16:17:52 UTC (rev 142)
+++ trunk/string.c 2009-12-08 17:17:54 UTC (rev 143)
@@ -226,7 +226,7 @@
str_len(string *s) {
register unsigned char *ss;
- if (s == NULL || s->s == NULL || s->len == 0) return(0);
+ if (s == NULL || s->s == NULL || s->a == 0) return(0);
ss = s->s;
while (s->len < s->a && *ss != 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lo...@us...> - 2009-12-03 16:17:58
|
Revision: 142
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=142&view=rev
Author: loos-br
Date: 2009-12-03 16:17:52 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
correcao dos bugs introduzidos no ultimo commit.
Modified Paths:
--------------
trunk/string.c
Modified: trunk/string.c
===================================================================
--- trunk/string.c 2009-11-16 19:25:10 UTC (rev 141)
+++ trunk/string.c 2009-12-03 16:17:52 UTC (rev 142)
@@ -140,24 +140,21 @@
size_t
str_get_size(size_t len) {
- size_t size = 0;
- if (len > STRINGOVER)
- len = STRINGOVER; /* clamp len - caution ! */
-
if (len < STRING_MIN_LEN)
return(STRING_MIN_LEN);
- size = len / STRING_MIN_LEN;
- if (len % STRING_MIN_LEN)
- size += STRING_MIN_LEN;
+ if (len > STRINGOVER)
+ len = STRINGOVER; /* clamp len - caution ! */
- return(size);
+ /* roundup size */
+ return ((len / STRING_MIN_LEN) * STRING_MIN_LEN + STRING_MIN_LEN);
}
size_t
str_copy(string *s, register const unsigned char *p, size_t len) {
register unsigned char *ss;
+ size_t sz_alloc;
/* oops */
if (s == NULL || p == NULL || len == 0) return(0);
@@ -166,13 +163,14 @@
str_reset(s);
/* alloc string */
- if (s->a == 0 || s->a <= len) {
+ if (len >= s->a) {
- if (s->a + len + 1 > STRINGOVER)
+ sz_alloc = str_get_size(len + 1);
+ if (sz_alloc == 0 || sz_alloc > STRINGOVER)
return(0); /* overflow */
/* alloc requested size */
- if (str_ready(s, str_get_size(len + 1)) == 0)
+ if (str_ready(s, sz_alloc) == 0)
return(0); /* nomem */
}
@@ -311,29 +309,30 @@
size_t
str_cat(string *s, const register unsigned char *p, size_t len) {
register unsigned char *ss;
- size_t tlen;
+ size_t sz_alloc;
+ size_t sz_copy;
/* oops */
if (s == NULL || p == NULL || len == 0) return(0);
/* check the total size */
- tlen = s->len + len;
- if (tlen > STRINGOVER)
+ sz_copy = s->len + len;
+ if (sz_copy > STRINGOVER)
return(0); /* overflow */
- if (tlen >= s->a) {
+ if (sz_copy >= s->a) {
- tlen = str_get_size(tlen + 1);
- if (tlen > STRINGOVER)
+ sz_alloc = str_get_size(sz_copy + 1);
+ if (sz_alloc > STRINGOVER)
return(0); /* overflow */
- if (str_ready(s, tlen) == 0)
+ if (str_ready(s, sz_alloc) == 0)
return(0); /* nomem */
}
ss = s->s;
ss += s->len;
- while (s->len < tlen) {
+ while (s->len < sz_copy) {
*ss++ = *p++;
s->len++;
}
@@ -358,10 +357,8 @@
if (s->a + STRING_MIN_LEN > STRINGOVER)
return(0); /* overflow */
- if (str_ready(s, s->len + STRING_MIN_LEN) == 0) {
- str_zero(s);
+ if (str_ready(s, s->a + STRING_MIN_LEN) == 0)
return(0);
- }
/* reset pointers */
ss = s->s;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: William K. <wil...@ra...> - 2009-12-03 16:01:54
|
Eu estou tendo alguns problemas com quedas,, postei no forum do sourceforge a alguns dias... abracos; 2009/12/3 Fábio Mello <ilu...@gm...> > Bom dia pessoas, > Quem está utilizando a ultima versão do msn-proxy disponibilizada no svn, > está tendo problemas? Ou está funcionando bala? > > Grato! > > > ------------------------------------------------------------------------------ > Join us December 9, 2009 for the Red Hat Virtual Experience, > a free event focused on virtualization and cloud computing. > Attend in-depth sessions from your desk. Your couch. Anywhere. > http://p.sf.net/sfu/redhat-sfdev2dev > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > |
|
From: Delton <del...@gm...> - 2009-12-03 13:59:06
|
As vezes passa um mês sem cair. As vezes cai 10 vezes em um dia. A interface web não funciona. Resumindo: não use em ambiente de produção. 2009/12/3 Fábio Mello <ilu...@gm...> > Bom dia pessoas, > Quem está utilizando a ultima versão do msn-proxy disponibilizada no svn, > está tendo problemas? Ou está funcionando bala? > > Grato! > > > ------------------------------------------------------------------------------ > Join us December 9, 2009 for the Red Hat Virtual Experience, > a free event focused on virtualization and cloud computing. > Attend in-depth sessions from your desk. Your couch. Anywhere. > http://p.sf.net/sfu/redhat-sfdev2dev > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > -- gnote te auton! |
|
From: Fábio M. <ilu...@gm...> - 2009-12-03 13:26:54
|
Bom dia pessoas, Quem está utilizando a ultima versão do msn-proxy disponibilizada no svn, está tendo problemas? Ou está funcionando bala? Grato! |
|
From: Vitor H. S. <vi...@ha...> - 2009-11-25 17:36:51
|
>Message: 5 >Date: Wed, 25 Nov 2009 15:17:24 -0200 .From: F?bio Mello <ilu...@gm...> Subject: Re: [msn-proxy-devel] Problemas com squid Autenticado! >o: msn...@li... >Message-ID: > <11c...@ma...> >Content-Type: text/plain; charset="iso-8859-1" > >Adicione uma regra que libere login.live.com sem autentica??o...> > >2009/11/25 Vitor Hugo Sampiron <vi...@ha...> > > Olá Fabio, mas estranho que so em uma maquina que não conecta nas outras maquinas que estão na rede e com o XP funciona, agora nesse notebook que esta via wireless e com o windows 7 não abre o msn, e quando abre não ta passando pelo msn-proxy, pra falar a verdade so passou 1 vez pelo msn-proxy as outras vezes dava erro ou passava direto. Att Vitor |
|
From: Fábio M. <ilu...@gm...> - 2009-11-25 17:17:52
|
Adicione uma regra que libere login.live.com sem autenticação... 2009/11/25 Vitor Hugo Sampiron <vi...@ha...> > Salve ilustres, boa tarde! > > > Alguem ja teve um problema com o squid autenticado + msn-proxy? > estou enfrentando esse problema, pois com o squid autenticado ele não > conecta de geito nehum no msn. > > > Obriagdo > > Att > Vitor > > > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus > on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > |
|
From: Vitor H. S. <vi...@ha...> - 2009-11-25 17:14:47
|
Salve ilustres, boa tarde! Alguem ja teve um problema com o squid autenticado + msn-proxy? estou enfrentando esse problema, pois com o squid autenticado ele não conecta de geito nehum no msn. Obriagdo Att Vitor |
|
From: <lo...@us...> - 2009-11-16 19:25:18
|
Revision: 141
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=141&view=rev
Author: loos-br
Date: 2009-11-16 19:25:10 +0000 (Mon, 16 Nov 2009)
Log Message:
-----------
pequenas correcoes/atualizacoes do codigo (nada muda por enquanto).
Modified Paths:
--------------
trunk/net-io.c
trunk/string.c
Modified: trunk/net-io.c
===================================================================
--- trunk/net-io.c 2009-10-15 16:01:06 UTC (rev 140)
+++ trunk/net-io.c 2009-11-16 19:25:10 UTC (rev 141)
@@ -262,7 +262,7 @@
/* get the user network address */
if (getnameinfo(sa, sa_len, host, sizeof(host), port, sizeof(port),
NI_NUMERICHOST | NI_NUMERICSERV) != 0) {
- return(RFAIL);
+ return(RFAIL);
}
if ((strlen(host) > 0 && str_copys(str_host, (unsigned char *)host) == 0) ||
Modified: trunk/string.c
===================================================================
--- trunk/string.c 2009-10-15 16:01:06 UTC (rev 140)
+++ trunk/string.c 2009-11-16 19:25:10 UTC (rev 141)
@@ -129,15 +129,13 @@
unsigned char *
_strchr(register unsigned char *s, int c) {
- if (!s)
- return((unsigned char *)0);
+ if (!s) return(NULL);
+
while (*s && *s != c) ++s;
+ if (*s) return(s);
- if (*s)
- return(s);
- else
- return((unsigned char *)0);
+ return(NULL);
}
size_t
@@ -150,15 +148,10 @@
if (len < STRING_MIN_LEN)
return(STRING_MIN_LEN);
- while (len > 0) {
-
+ size = len / STRING_MIN_LEN;
+ if (len % STRING_MIN_LEN)
size += STRING_MIN_LEN;
- if (len >= STRING_MIN_LEN)
- len -= STRING_MIN_LEN;
- else
- len = 0;
- }
return(size);
}
@@ -166,16 +159,12 @@
str_copy(string *s, register const unsigned char *p, size_t len) {
register unsigned char *ss;
- if (s == (string *)0)
- /* oops */
- return(0);
+ /* oops */
+ if (s == NULL || p == NULL || len == 0) return(0);
/* reset string length */
str_reset(s);
- if (p == (unsigned char *)0 || len == 0)
- return(0);
-
/* alloc string */
if (s->a == 0 || s->a <= len) {
@@ -203,30 +192,17 @@
register unsigned char *ss;
/* check for string */
- if (s == (string *)0)
- /* oops */
- return(0);
+ if (s == NULL || p == NULL) return(0);
/* reset string length */
str_reset(s);
- if (!p)
- return(0);
-
- /* alloc string or take another one */
- if (s->a == 0) {
-
- /* alloc len */
- if (str_ready(s, STRING_MIN_LEN) == 0)
- return(0); /* nomem */
- }
-
/* copy */
ss = s->s;
while (*p) {
- /* check for size */
- if ((s->len + 1) == s->a) {
+ /* alloc memory as needed */
+ if ((s->len + 1) >= s->a) {
if (s->a + STRING_MIN_LEN > STRINGOVER)
return(0); /* overflow */
@@ -251,46 +227,45 @@
size_t
str_len(string *s) {
register unsigned char *ss;
- register size_t len = 0;
- if (!s || !s->s)
- return len;
+ if (s == NULL || s->s == NULL || s->len == 0) return(0);
ss = s->s;
- while (len < s->a && *ss != 0) {
- ++len; ++ss;
+ while (s->len < s->a && *ss != 0) {
+ ++s->len; ++ss;
}
- s->len = len;
- return(len);
+ return(s->len);
}
-string *str_alloc(void) {
+string *
+str_alloc(void) {
string *rtrn;
rtrn = (string *)malloc(sizeof(string));
- if (rtrn == (string *)0)
- return((string *)0);
-
+ if (rtrn == NULL) return(NULL);
str_zero(rtrn);
return(rtrn);
}
-void str_reset(string *s) {
+void
+str_reset(string *s) {
s->len = 0;
}
-void str_zero(string *s) {
- s->s = (unsigned char *)0;
- s->p = (unsigned char *)0;
+void
+str_zero(string *s) {
+ s->s = NULL;
+ s->p = NULL;
s->a = 0;
s->len = 0;
}
-void str_free(string *s) {
- if (s == (string *)0)
- return;
+void
+str_free(string *s) {
+ if (s == NULL) return;
+
if (s->a > 0 && s->s)
free(s->s);
@@ -304,8 +279,7 @@
str_strip(string *s) {
unsigned char *p;
- if (!s || !s->s)
- return;
+ if (s == NULL || s->s == NULL || s->len == 0) return;
/* search cr/lf */
p = _strchr(s->s, '\r');
@@ -322,15 +296,11 @@
size_t
str_ready(string *s, size_t size) {
- if (s == (string *)0)
- return(0);
- if (size <= 0)
- return(0);
+ if (s == NULL || size <= 0) return(0);
s->s = (unsigned char *)realloc(s->s, size);
- if (s->s == (unsigned char *)0)
- return(0);
+ if (s->s == NULL) return(0);
s->a = size;
s->p = s->s;
@@ -343,24 +313,21 @@
register unsigned char *ss;
size_t tlen;
- if (s == (string *)0)
- /* oops */
- return(0);
+ /* oops */
+ if (s == NULL || p == NULL || len == 0) return(0);
- if (p == (unsigned char *)0 || len == 0)
- return(0);
-
- /* calcule total len */
+ /* check the total size */
tlen = s->len + len;
if (tlen > STRINGOVER)
return(0); /* overflow */
- if (s->a == 0 || s->a <= tlen) {
+ if (tlen >= s->a) {
- if (s->a + tlen + 1 > STRINGOVER)
+ tlen = str_get_size(tlen + 1);
+ if (tlen > STRINGOVER)
return(0); /* overflow */
- if (str_ready(s, str_get_size(tlen + 1)) == 0)
+ if (str_ready(s, tlen) == 0)
return(0); /* nomem */
}
@@ -379,26 +346,14 @@
str_cats(string *s, register const unsigned char *p) {
register unsigned char *ss;
- if (s == (string *)0)
- /* oops */
- return(0);
+ /* oops */
+ if (s == NULL || p == NULL) return(0);
- if (p == (unsigned char *)0)
- return(0);
-
- if (s->a == 0) {
-
- if (str_ready(s, STRING_MIN_LEN) == 0) {
- str_zero(s);
- return(0);
- }
- }
-
ss = s->s;
ss += s->len;
while (*p) {
- if ((s->len + 1) == s->a) {
+ if ((s->len + 1) >= s->a) {
if (s->a + STRING_MIN_LEN > STRINGOVER)
return(0); /* overflow */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lo...@us...> - 2009-10-15 16:01:12
|
Revision: 140
http://msn-proxy.svn.sourceforge.net/msn-proxy/?rev=140&view=rev
Author: loos-br
Date: 2009-10-15 16:01:06 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
adicionado o patch do Vinny que faz uma paginacao basica dos resultados para a versao 0.7
Modified Paths:
--------------
branches/msn-proxy-0.7/php/chat.php
Added Paths:
-----------
branches/msn-proxy-0.7/
Modified: branches/msn-proxy-0.7/php/chat.php
===================================================================
--- tags/msn-proxy-0.7/php/chat.php 2009-08-25 20:45:00 UTC (rev 136)
+++ branches/msn-proxy-0.7/php/chat.php 2009-10-15 16:01:06 UTC (rev 140)
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004-2009 Luiz Otavio O Souza <lo...@gm...>
+ * Copyright (c) 2004-2009, Luiz Otavio O Souza <lo...@gm...>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -37,10 +37,83 @@
<td align="center" bgcolor="#EBEBEB">Visualizar</td>
</tr>
<?php
+
+ $sql = "SELECT count(DISTINCT sb_id) ";
+ $sql .= "FROM log WHERE ";
+ $sql .= "email = '".$_REQUEST['email']."' AND (type = 'start' OR type = 'join') ";
+
+ $row = NULL;
+ $count = 0;
+ $rs = mysql_query($sql, $mysql);
+ if ($rs)
+ $row = mysql_fetch_row($rs);
+ if ($row)
+ $count = intval($row[0]);
+
+ $porpagina = 150;
+ $paginas = intval($count / $porpagina);
+ if ($count % $porpagina)
+ $paginas++;
+
+ if (isset($_REQUEST['pagina'])) {
+ $pagina = intval($_REQUEST['pagina']);
+ } else
+ $pagina =1;
+
+ // $limit = ($pagina - 1) * $porpagina;
+ $limit = ($porpagina * $pagina) - $porpagina;
+
+ echo "<div align=\"center\">";
+ echo "P\xE1gina<br>\n";
+
+ $atual=$pagina;
+ $atual2=$pagina;
+ if ($pagina > 1) {
+ $menos = $pagina - 1;
+ $url = "";
+ echo "<a href=\"". $_SERVER['PHP_SELF'] ."?email=". $_REQUEST['email'];
+ $atual=$atual-1;
+ echo "&pagina=". $atual ."\">";
+ echo "Anterior </a>";
+ }
+ else {
+ echo "";
+ }
+
+ for($p = 1; $p <= $paginas; $p++) {
+
+
+
+ echo "<a href=\"". $_SERVER['PHP_SELF'] ."?email=". $_REQUEST['email'];
+ echo "&pagina=". $p ."\">";
+ if ($pagina == $p)
+ echo "<b> ". $p ."</b> ";
+ else
+ echo $p ." ";
+ echo "</a>\n";
+ }
+
+ if ($pagina < ($paginas)) {
+ $mais = $pagina + 1;
+ $url = "";
+ echo "<a href=\"". $_SERVER['PHP_SELF'] ."?email=". $_REQUEST['email'];
+ $atual2=$atual2+1;
+ echo "&pagina=". $atual2 ."\">";
+ echo "Pr\xF3xima </a>";
+ }
+ else {
+ echo "";
+ }
+echo "</div>";
+
+//echo "<br>$count<br>\n";
+//echo "limit $limit<br>\n";
+//echo "Voce est\xE1 na p\xE1gina $pagina de $paginas<br>\n";
+
$sql = "SELECT DISTINCT sb_id, date, display_name, type ";
$sql .= "FROM log WHERE ";
- $sql .= "email = '".$_REQUEST['email']."' AND (type = 'start' OR type = 'join')";
- $sql .= "ORDER BY date DESC ";
+ $sql .= "email = '".$_REQUEST['email']."' AND (type = 'start' OR type = 'join') ";
+ $sql .= "ORDER BY date DESC LIMIT ". $limit .",". $porpagina;
$rs = mysql_query($sql, $mysql);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Leonardo D. R. <leo...@gm...> - 2009-09-29 20:25:17
|
Dennis, ainda não coloquei em produção o que está no trunk. Te falar para usar a versão do trunk em um instalação em produção é complicado, mas testes são bem-vindos =D. Estamos fazendo a migração para o uso do autotools, implementando mais algumas funcionalidades e arrumando as que estão "quebradas", em breve teremos novidades. [ ]'s -- Leonardo 2009/9/29 Dennis Kelbert <den...@gm...>: > Leonardo, > Utilizei do branches, ainda na versão 137. > Porem nao encontrei partes de código na 138/139 que tivessem algo a > respeito. > > Mas se me disser que a 139 é a solução, parto pra cima. > > abraços > > > > > 2009/9/29 Leonardo Duarte Rogoski <leo...@gm...> >> >> Dennis, esse problemas vc encontrou na versão do trunk? >> >> -- >> Leonardo >> >> 2009/9/29 Dennis Kelbert <den...@gm...>: >> > Não. >> > >> > Mas de vez em quando as mensagens retornam dizendo que excederam o nr >> > máximo >> > de mensagens por minuto. >> > Também as vezes o MSN-PROXY trava, sendo necessário reinicia-lo. >> > >> > >> > >> > 2009/9/29 Fábio Mello <ilu...@gm...> >> >> >> >> Alguém mais pegou este erro: >> >> >> >> listen on [0.0.0.0:1863] >> >> debug: connection from [192.168.1.235:3693] >> >> connected to [messenger.hotmail.com:1863] >> >> read fail: [Connection reset by peer] >> >> server_read_command cmd buf: [(null)] >> >> debug: fail to read ns server command >> >> debug: connection from [192.168.1.181:2338] >> >> connected to [messenger.hotmail.com:1863] >> >> read fail: [Connection reset by peer] >> >> >> >> ?? >> >> >> >> Grato! >> >> >> >> >> >> >> >> ------------------------------------------------------------------------------ >> >> Come build with us! The BlackBerry® Developer Conference in SF, CA >> >> is the only developer event you need to attend this year. Jumpstart >> >> your >> >> developing skills, take BlackBerry mobile applications to market and >> >> stay >> >> ahead of the curve. Join us from November 9-12, 2009. Register >> >> now! >> >> http://p.sf.net/sfu/devconf >> >> _______________________________________________ >> >> msn-proxy-devel mailing list >> >> msn...@li... >> >> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel >> >> >> > >> > >> > >> > ------------------------------------------------------------------------------ >> > Come build with us! The BlackBerry® Developer Conference in SF, CA >> > is the only developer event you need to attend this year. Jumpstart your >> > developing skills, take BlackBerry mobile applications to market and >> > stay >> > ahead of the curve. Join us from November 9-12, 2009. Register >> > now! >> > http://p.sf.net/sfu/devconf >> > _______________________________________________ >> > msn-proxy-devel mailing list >> > msn...@li... >> > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel >> > >> > >> >> >> ------------------------------------------------------------------------------ >> Come build with us! The BlackBerry® Developer Conference in SF, CA >> is the only developer event you need to attend this year. Jumpstart your >> developing skills, take BlackBerry mobile applications to market and stay >> ahead of the curve. Join us from November 9-12, 2009. Register >> now! >> http://p.sf.net/sfu/devconf >> _______________________________________________ >> msn-proxy-devel mailing list >> msn...@li... >> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > |
|
From: Dennis K. <den...@gm...> - 2009-09-29 19:33:50
|
Leonardo, Utilizei do branches, ainda na versão 137. Porem nao encontrei partes de código na 138/139 que tivessem algo a respeito. Mas se me disser que a 139 é a solução, parto pra cima. abraços 2009/9/29 Leonardo Duarte Rogoski <leo...@gm...> > Dennis, esse problemas vc encontrou na versão do trunk? > > -- > Leonardo > > 2009/9/29 Dennis Kelbert <den...@gm...>: > > Não. > > > > Mas de vez em quando as mensagens retornam dizendo que excederam o nr > máximo > > de mensagens por minuto. > > Também as vezes o MSN-PROXY trava, sendo necessário reinicia-lo. > > > > > > > > 2009/9/29 Fábio Mello <ilu...@gm...> > >> > >> Alguém mais pegou este erro: > >> > >> listen on [0.0.0.0:1863] > >> debug: connection from [192.168.1.235:3693] > >> connected to [messenger.hotmail.com:1863] > >> read fail: [Connection reset by peer] > >> server_read_command cmd buf: [(null)] > >> debug: fail to read ns server command > >> debug: connection from [192.168.1.181:2338] > >> connected to [messenger.hotmail.com:1863] > >> read fail: [Connection reset by peer] > >> > >> ?? > >> > >> Grato! > >> > >> > >> > ------------------------------------------------------------------------------ > >> Come build with us! The BlackBerry® Developer Conference in SF, CA > >> is the only developer event you need to attend this year. Jumpstart your > >> developing skills, take BlackBerry mobile applications to market and > stay > >> ahead of the curve. Join us from November 9-12, 2009. Register > >> now! > >> http://p.sf.net/sfu/devconf > >> _______________________________________________ > >> msn-proxy-devel mailing list > >> msn...@li... > >> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > >> > > > > > > > ------------------------------------------------------------------------------ > > Come build with us! The BlackBerry® Developer Conference in SF, CA > > is the only developer event you need to attend this year. Jumpstart your > > developing skills, take BlackBerry mobile applications to market and stay > > ahead of the curve. Join us from November 9-12, 2009. Register > now! > > http://p.sf.net/sfu/devconf > > _______________________________________________ > > msn-proxy-devel mailing list > > msn...@li... > > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > > > > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > |
|
From: Leonardo D. R. <leo...@gm...> - 2009-09-29 19:30:11
|
Desculpe, *esses problemas* =D. 2009/9/29 Leonardo Duarte Rogoski <leo...@gm...>: > Dennis, esse problemas vc encontrou na versão do trunk? > > -- > Leonardo > > 2009/9/29 Dennis Kelbert <den...@gm...>: >> Não. >> >> Mas de vez em quando as mensagens retornam dizendo que excederam o nr máximo >> de mensagens por minuto. >> Também as vezes o MSN-PROXY trava, sendo necessário reinicia-lo. >> >> >> >> 2009/9/29 Fábio Mello <ilu...@gm...> >>> >>> Alguém mais pegou este erro: >>> >>> listen on [0.0.0.0:1863] >>> debug: connection from [192.168.1.235:3693] >>> connected to [messenger.hotmail.com:1863] >>> read fail: [Connection reset by peer] >>> server_read_command cmd buf: [(null)] >>> debug: fail to read ns server command >>> debug: connection from [192.168.1.181:2338] >>> connected to [messenger.hotmail.com:1863] >>> read fail: [Connection reset by peer] >>> >>> ?? >>> >>> Grato! >>> >>> >>> ------------------------------------------------------------------------------ >>> Come build with us! The BlackBerry® Developer Conference in SF, CA >>> is the only developer event you need to attend this year. Jumpstart your >>> developing skills, take BlackBerry mobile applications to market and stay >>> ahead of the curve. Join us from November 9-12, 2009. Register >>> now! >>> http://p.sf.net/sfu/devconf >>> _______________________________________________ >>> msn-proxy-devel mailing list >>> msn...@li... >>> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel >>> >> >> >> ------------------------------------------------------------------------------ >> Come build with us! The BlackBerry® Developer Conference in SF, CA >> is the only developer event you need to attend this year. Jumpstart your >> developing skills, take BlackBerry mobile applications to market and stay >> ahead of the curve. Join us from November 9-12, 2009. Register now! >> http://p.sf.net/sfu/devconf >> _______________________________________________ >> msn-proxy-devel mailing list >> msn...@li... >> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel >> >> > |
|
From: Leonardo D. R. <leo...@gm...> - 2009-09-29 19:26:01
|
Dennis, esse problemas vc encontrou na versão do trunk? -- Leonardo 2009/9/29 Dennis Kelbert <den...@gm...>: > Não. > > Mas de vez em quando as mensagens retornam dizendo que excederam o nr máximo > de mensagens por minuto. > Também as vezes o MSN-PROXY trava, sendo necessário reinicia-lo. > > > > 2009/9/29 Fábio Mello <ilu...@gm...> >> >> Alguém mais pegou este erro: >> >> listen on [0.0.0.0:1863] >> debug: connection from [192.168.1.235:3693] >> connected to [messenger.hotmail.com:1863] >> read fail: [Connection reset by peer] >> server_read_command cmd buf: [(null)] >> debug: fail to read ns server command >> debug: connection from [192.168.1.181:2338] >> connected to [messenger.hotmail.com:1863] >> read fail: [Connection reset by peer] >> >> ?? >> >> Grato! >> >> >> ------------------------------------------------------------------------------ >> Come build with us! The BlackBerry® Developer Conference in SF, CA >> is the only developer event you need to attend this year. Jumpstart your >> developing skills, take BlackBerry mobile applications to market and stay >> ahead of the curve. Join us from November 9-12, 2009. Register >> now! >> http://p.sf.net/sfu/devconf >> _______________________________________________ >> msn-proxy-devel mailing list >> msn...@li... >> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel >> > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > |
|
From: Leonardo D. R. <leo...@gm...> - 2009-09-29 18:15:12
|
Fábio, por favor, execute o msn-proxy com a opção "-v" e mande a saída toda. Obrigado. -- Leonardo 2009/9/29 Dennis Kelbert <den...@gm...>: > Não. > > Mas de vez em quando as mensagens retornam dizendo que excederam o nr máximo > de mensagens por minuto. > Também as vezes o MSN-PROXY trava, sendo necessário reinicia-lo. > > > > 2009/9/29 Fábio Mello <ilu...@gm...> >> >> Alguém mais pegou este erro: >> >> listen on [0.0.0.0:1863] >> debug: connection from [192.168.1.235:3693] >> connected to [messenger.hotmail.com:1863] >> read fail: [Connection reset by peer] >> server_read_command cmd buf: [(null)] >> debug: fail to read ns server command >> debug: connection from [192.168.1.181:2338] >> connected to [messenger.hotmail.com:1863] >> read fail: [Connection reset by peer] >> >> ?? >> >> Grato! >> >> >> ------------------------------------------------------------------------------ >> Come build with us! The BlackBerry® Developer Conference in SF, CA >> is the only developer event you need to attend this year. Jumpstart your >> developing skills, take BlackBerry mobile applications to market and stay >> ahead of the curve. Join us from November 9-12, 2009. Register >> now! >> http://p.sf.net/sfu/devconf >> _______________________________________________ >> msn-proxy-devel mailing list >> msn...@li... >> https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel >> > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > |
|
From: Dennis K. <den...@gm...> - 2009-09-29 18:13:10
|
Não. Mas de vez em quando as mensagens retornam dizendo que excederam o nr máximo de mensagens por minuto. Também as vezes o MSN-PROXY trava, sendo necessário reinicia-lo. 2009/9/29 Fábio Mello <ilu...@gm...> > Alguém mais pegou este erro: > > listen on [0.0.0.0:1863] > debug: connection from [192.168.1.235:3693] > connected to [messenger.hotmail.com:1863] > read fail: [Connection reset by peer] > server_read_command cmd buf: [(null)] > debug: fail to read ns server command > debug: connection from [192.168.1.181:2338] > connected to [messenger.hotmail.com:1863] > read fail: [Connection reset by peer] > > ?? > > Grato! > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > msn-proxy-devel mailing list > msn...@li... > https://lists.sourceforge.net/lists/listinfo/msn-proxy-devel > > |
1 message has been excluded from this view by a project administrator.
