This email list is read-only. Emails sent to this list will be discarded
----------------------------------
src/bluetooth.c | 7 ++++++-
src/main.c | 7 ++++++-
src/obex.c | 10 +++++-----
src/obex.h | 2 ++
4 files changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 7275aef0fd47fde3cc7a2b976bc990c1791a10fa
Author: Johan Hedberg <[EMAIL PROTECTED]>
Date: Wed Nov 19 15:43:12 2008 +0200
Use g_malloc and g_new where appropriate
commit d7f6a828761b82721415ea2a21defc989ef9fe70
Author: Johan Hedberg <[EMAIL PROTECTED]>
Date: Wed Nov 19 15:40:29 2008 +0200
Allow server/transport specific MTU's
Diff in this email is a maximum of 400 lines.
diff --git a/src/bluetooth.c b/src/bluetooth.c
index fc3985c..0b0037b 100644
--- a/src/bluetooth.c
+++ b/src/bluetooth.c
@@ -46,6 +46,9 @@
#include "obex.h"
#include "dbus.h"
+#define BT_RX_MTU 32767
+#define BT_TX_MTU 32767
+
static GSList *servers = NULL;
static gboolean connect_event(GIOChannel *io, GIOCondition cond, gpointer
user_data)
@@ -174,7 +177,7 @@ static gint server_register(guint16 service, const gchar
*name, guint8 channel,
uint32_t handle;
int err;
- server = g_malloc0(sizeof(struct server));
+ server = g_new0(struct server, 1);
server->services = service;
server->name = g_strdup(name);
server->folder = g_strdup(folder);
@@ -183,6 +186,8 @@ static gint server_register(guint16 service, const gchar
*name, guint8 channel,
server->channel = channel;
server->handle = handle;
server->secure = secure;
+ server->rx_mtu = BT_RX_MTU;
+ server->tx_mtu = BT_TX_MTU;
err = server_start(server);
if (err < 0) {
diff --git a/src/main.c b/src/main.c
index d8da5bd..b2c308a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -64,6 +64,9 @@ static int services = 0;
static gboolean tty_needs_reinit = FALSE;
static int signal_pipe[2];
+#define TTY_RX_MTU 65535
+#define TTY_TX_MTU 65535
+
int tty_init(int services, const gchar *root_path,
const gchar *capability, const gchar *devnode)
{
@@ -85,12 +88,14 @@ int tty_init(int services, const gchar *root_path,
cfmakeraw(&options);
tcsetattr(fd, TCSANOW, &options);
- server = g_malloc0(sizeof(struct server));
+ server = g_new0(struct server, 1);
server->services = services;
server->folder = g_strdup(root_path);
server->auto_accept = TRUE;
server->capability = g_strdup(capability);
server->devnode = g_strdup(devnode);
+ server->rx_mtu = TTY_RX_MTU;
+ server->tx_mtu = TTY_TX_MTU;
ret = obex_session_start(fd, server);
if (ret < 0) {
diff --git a/src/obex.c b/src/obex.c
index 3a0f3c2..84409ff 100644
--- a/src/obex.c
+++ b/src/obex.c
@@ -49,8 +49,8 @@
#include "dbus.h"
/* Default MTU's */
-#define RX_MTU 32767
-#define TX_MTU 32767
+#define DEFAULT_RX_MTU 32767
+#define DEFAULT_TX_MTU 32767
#define TARGET_SIZE 16
@@ -438,7 +438,7 @@ gboolean os_prepare_get(struct obex_session *os, gchar
*file, guint32 *size)
os->offset = 0;
if (stats.st_size > 0)
- os->buf = g_new0(guint8, os->tx_mtu);
+ os->buf = g_malloc0(os->tx_mtu);
*size = stats.st_size;
@@ -970,8 +970,8 @@ gint obex_session_start(gint fd, struct server *server)
os->current_folder = g_strdup(server->folder);
os->server = server;
- os->rx_mtu = RX_MTU;
- os->tx_mtu = TX_MTU;
+ os->rx_mtu = server->rx_mtu ? server->rx_mtu : DEFAULT_RX_MTU;
+ os->tx_mtu = server->tx_mtu ? server->tx_mtu : DEFAULT_TX_MTU;
os->fd = -1;
os->size = OBJECT_SIZE_DELETE;
diff --git a/src/obex.h b/src/obex.h
index a1b41bb..d903095 100644
--- a/src/obex.h
+++ b/src/obex.h
@@ -57,6 +57,8 @@ struct server {
gboolean secure;
GIOChannel *io;
guint watch;
+ guint16 tx_mtu;
+ guint16 rx_mtu;
};
struct obex_session {
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
