[PATCH obexd 08/14] Add psm parameter for create_session.

@@ -125,7 +125,7 @@ done:

 static int parse_device_dict(DBusMessageIter *iter,
 		const char **source, const char **dest, const char **target,
-		uint8_t *channel)
+		uint8_t *channel, uint16_t *psm)
 {
 	while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_DICT_ENTRY) {
 		DBusMessageIter entry, value;

@@ -150,6 +150,10 @@ static int parse_device_dict(DBusMessageIter *iter,
 			if (g_str_equal(key, "Channel") == TRUE)
 				dbus_message_iter_get_basic(&value, channel);
 			break;
+		case DBUS_TYPE_UINT16:
+			if (g_str_equal(key, "Psm") == TRUE)
+				dbus_message_iter_get_basic(&value, psm);
+			break;
 		}

 		dbus_message_iter_next(iter);

@@ -168,11 +172,12 @@ static DBusMessage *send_files(DBusConnection *connection,
 	const char *agent, *source = NULL, *dest = NULL, *target = NULL;
 	const char *sender;
 	uint8_t channel = 0;
+	uint16_t psm = 0;

 	dbus_message_iter_init(message, &iter);
 	dbus_message_iter_recurse(&iter, &array);

-	parse_device_dict(&array, &source, &dest, &target, &channel);
+	parse_device_dict(&array, &source, &dest, &target, &channel, &psm);
 	if (dest == NULL)
 		return g_dbus_create_error(message,
 				"org.openobex.Error.InvalidArguments", NULL);

@@ -218,7 +223,7 @@ static DBusMessage *send_files(DBusConnection *connection,
 	data->agent = g_strdup(agent);
 	data->files = files;

-	session = session_create(source, dest, "OPP", channel, sender,
+	session = session_create(source, dest, "OPP", channel, psm, sender,
 							create_callback, data);
 	if (session != NULL) {
 		sessions = g_slist_append(sessions, session);

@@ -295,11 +300,12 @@ static DBusMessage *pull_business_card(DBusConnection *connection,
 	const char *source = NULL, *dest = NULL, *target = NULL;
 	const char *name = NULL;
 	uint8_t channel = 0;
+	uint16_t psm = 0;

 	dbus_message_iter_init(message, &iter);
 	dbus_message_iter_recurse(&iter, &dict);

-	parse_device_dict(&dict, &source, &dest, &target, &channel);
+	parse_device_dict(&dict, &source, &dest, &target, &channel, &psm);
 	if (dest == NULL)
 		return g_dbus_create_error(message,
 				"org.openobex.Error.InvalidArguments", NULL);

@@ -322,7 +328,7 @@ static DBusMessage *pull_business_card(DBusConnection *connection,
 	data->sender = g_strdup(dbus_message_get_sender(message));
 	data->filename = g_strdup(name);

-	session = session_create(source, dest, "OPP", channel, data->sender,
+	session = session_create(source, dest, "OPP", channel, psm, data->sender,
 					pull_session_callback, data);
 	if (session != NULL) {
 		sessions = g_slist_append(sessions, session);

@@ -366,11 +372,12 @@ static DBusMessage *create_session(DBusConnection *connection,
 	struct send_data *data;
 	const char *source = NULL, *dest = NULL, *target = NULL;
 	uint8_t channel = 0;
+	uint16_t psm = 0;

 	dbus_message_iter_init(message, &iter);
 	dbus_message_iter_recurse(&iter, &dict);

-	parse_device_dict(&dict, &source, &dest, &target, &channel);
+	parse_device_dict(&dict, &source, &dest, &target, &channel, &psm);
 	if (dest == NULL || target == NULL)
 		return g_dbus_create_error(message,
 				"org.openobex.Error.InvalidArguments", NULL);

@@ -384,7 +391,7 @@ static DBusMessage *create_session(DBusConnection *connection,
 	data->message = dbus_message_ref(message);
 	data->sender = g_strdup(dbus_message_get_sender(message));

-	session = session_create(source, dest, target, channel, data->sender,
+	session = session_create(source, dest, target, channel, psm, data->sender,
 							create_callback, data);
 	if (session != NULL) {
 		sessions = g_slist_append(sessions, session);

@@ -493,11 +500,12 @@ static DBusMessage *get_capabilities(DBusConnection *connection,
 	struct send_data *data;
 	const char *source = NULL, *dest = NULL, *target = NULL;
 	uint8_t channel = 0;
+	uint16_t psm = 0;

 	dbus_message_iter_init(message, &iter);
 	dbus_message_iter_recurse(&iter, &dict);

-	parse_device_dict(&dict, &source, &dest, &target, &channel);
+	parse_device_dict(&dict, &source, &dest, &target, &channel, &psm);
 	if (dest == NULL)
 		return g_dbus_create_error(message,
 				"org.openobex.Error.InvalidArguments", NULL);

@@ -514,7 +522,7 @@ static DBusMessage *get_capabilities(DBusConnection *connection,
 	if (!target)
 		target = "OPP";

-	session = session_create(source, dest, target, channel, data->sender,
+	session = session_create(source, dest, target, channel, psm, data->sender,
 					capability_session_callback, data);
 	if (session != NULL) {
 		sessions = g_slist_append(sessions, session);

@@ -535,6 +535,7 @@ struct session_data *session_create(const char *source,
 						const char *destination,
 						const char *service,
 						uint8_t channel,
+						uint16_t psm,
 						const char *owner,
 						session_callback_t function,
 						void *user_data)

@@ -60,6 +60,7 @@ struct session_data *session_create(const char *source,
 						const char *destination,
 						const char *service,
 						uint8_t channel,
+						uint16_t psm,
 						const char *owner,
 						session_callback_t function,
 						void *user_data);
--