Changeset 3638
- Timestamp:
- 09/05/08 12:31:59 (3 months ago)
- Location:
- plugins/syncml/src
- Files:
-
- 3 modified
-
syncml_common.c (modified) (11 diffs)
-
syncml_common.h (modified) (2 diffs)
-
syncml_obex_client.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
plugins/syncml/src/syncml_common.c
r3600 r3638 467 467 SmlError *error = NULL; 468 468 469 if (!smlDataSyncSetOption(dsObject, "USE_TIMESTAMP_ANCHOR", "1", &error)) 469 if (!smlDataSyncSetOption( 470 dsObject, 471 SML_DATA_SYNC_CONFIG_USE_TIMESTAMP_ANCHOR, 472 "1", &error)) 470 473 goto error; 471 474 if (!smlDataSyncSetOption( 472 475 dsObject, 473 "MAX_MSG_SIZE",476 SML_DATA_SYNC_CONFIG_MAX_MSG_SIZE, 474 477 OSYNC_PLUGIN_SYNCML_MAX_MSG_SIZE, 475 478 &error)) … … 477 480 if (!smlDataSyncSetOption( 478 481 dsObject, 479 "MAX_OBJ_SIZE",482 SML_DATA_SYNC_CONFIG_MAX_OBJ_SIZE, 480 483 OSYNC_PLUGIN_SYNCML_MAX_OBJ_SIZE, 481 484 &error)) … … 490 493 switch(osync_plugin_connection_get_type(conn)) { 491 494 case OSYNC_PLUGIN_CONNECTION_BLUETOOTH: 492 if (!smlDataSyncSetOption(dsObject, "CONNECTION_TYPE", "BLUETOOTH", &error)) 495 if (!smlDataSyncSetOption( 496 dsObject, 497 SML_DATA_SYNC_CONFIG_CONNECTION_TYPE, 498 SML_DATA_SYNC_CONFIG_CONNECTION_BLUETOOTH, 499 &error)) 493 500 goto error; 494 501 if (!smlDataSyncSetOption( 495 502 dsObject, 496 "BLUETOOTH_ADDRESS",503 SML_TRANSPORT_CONFIG_BLUETOOTH_ADDRESS, 497 504 osync_plugin_connection_bt_get_addr(conn), 498 505 &error)) … … 501 508 { 502 509 char *channel = g_strdup_printf("%u", osync_plugin_connection_bt_get_channel(conn)); 503 if (!smlDataSyncSetOption(dsObject, "BLUETOOTH_CHANNEL", channel, &error)) 510 if (!smlDataSyncSetOption( 511 dsObject, 512 SML_TRANSPORT_CONFIG_BLUETOOTH_CHANNEL, 513 channel, &error)) 504 514 { 505 515 smlSafeCFree(&channel); … … 511 521 case OSYNC_PLUGIN_CONNECTION_USB: 512 522 /* TODO: osync_plugin_connection_usb_get_interface(conn); */ 513 if (!smlDataSyncSetOption(dsObject, "CONNECTION_TYPE", "USB", &error)) 523 if (!smlDataSyncSetOption( 524 dsObject, 525 SML_DATA_SYNC_CONFIG_CONNECTION_TYPE, 526 SML_DATA_SYNC_CONFIG_CONNECTION_USB, 527 &error)) 514 528 goto error; 515 529 break; 516 530 case OSYNC_PLUGIN_CONNECTION_SERIAL: 517 531 /* TODO serial */ 518 if (!smlDataSyncSetOption(dsObject, "CONNECTION_TYPE", "SERIAL", &error)) 532 if (!smlDataSyncSetOption( 533 dsObject, 534 SML_DATA_SYNC_CONFIG_CONNECTION_TYPE, 535 SML_DATA_SYNC_CONFIG_CONNECTION_SERIAL, 536 &error)) 519 537 goto error; 520 538 break; 521 539 case OSYNC_PLUGIN_CONNECTION_IRDA: 522 540 /* TODO IRDA */ 523 if (!smlDataSyncSetOption(dsObject, "CONNECTION_TYPE", "IRDA", &error)) 541 if (!smlDataSyncSetOption( 542 dsObject, 543 SML_DATA_SYNC_CONFIG_CONNECTION_TYPE, 544 SML_DATA_SYNC_CONFIG_CONNECTION_IRDA, 545 &error)) 524 546 goto error; 525 547 break; … … 527 549 /* TODO Network */ 528 550 if (tsp == SML_TRANSPORT_OBEX_CLIENT && 529 !smlDataSyncSetOption(dsObject, "CONNECTION_TYPE", "NET", &error)) 551 !smlDataSyncSetOption( 552 dsObject, 553 SML_DATA_SYNC_CONFIG_CONNECTION_TYPE, 554 SML_DATA_SYNC_CONFIG_CONNECTION_NET, 555 &error)) 530 556 goto error; 531 557 if (tsp == SML_TRANSPORT_HTTP_CLIENT) … … 537 563 } else { 538 564 char *port = g_strdup_printf("%u", osync_plugin_connection_net_get_port(conn)); 539 if (!smlDataSyncSetOption(dsObject, "PORT", port, &error)) 565 if (!smlDataSyncSetOption( 566 dsObject, 567 SML_TRANSPORT_CONFIG_PORT, 568 port, &error)) 540 569 { 541 570 smlSafeCFree(&port); … … 559 588 value = NULL; 560 589 if (value && 561 !smlDataSyncSetOption(dsObject, "USERNAME", value, &error)) 590 !smlDataSyncSetOption( 591 dsObject, 592 SML_DATA_SYNC_CONFIG_AUTH_USERNAME, 593 value, &error)) 562 594 goto error; 563 595 value = osync_plugin_authentication_get_password(auth); … … 565 597 value = NULL; 566 598 if (value && 567 !smlDataSyncSetOption(dsObject, "PASSWORD", value, &error)) 599 !smlDataSyncSetOption( 600 dsObject, 601 SML_DATA_SYNC_CONFIG_AUTH_PASSWORD, 602 value, &error)) 568 603 goto error; 569 604 } … … 580 615 581 616 if (!strcmp(SYNCML_PLUGIN_CONFIG_SANVERSION, name)) { 582 key = "VERSION";617 key = SML_DATA_SYNC_CONFIG_VERSION; 583 618 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_WBXML, name)) { 584 key = "USE_WBXML";619 key = SML_DATA_SYNC_CONFIG_USE_WBXML; 585 620 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_ATCOMMAND, name)) { 586 key = "AT_COMMAND";621 key = SML_TRANSPORT_CONFIG_AT_COMMAND; 587 622 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_ATMANUFACTURER, name)) { 588 key = "AT_MANUFACTURER";623 key = SML_TRANSPORT_CONFIG_AT_MANUFACTURER; 589 624 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_ATMODEL, name)) { 590 key = "AT_MODEL";625 key = SML_TRANSPORT_CONFIG_AT_MODEL; 591 626 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_IDENTIFIER, name)) { 592 key = "IDENTIFIER";627 key = SML_DATA_SYNC_CONFIG_IDENTIFIER; 593 628 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_USESTRINGTABLE, name)) { 594 key = "USE_STRING_TABLE";629 key = SML_DATA_SYNC_CONFIG_USE_STRING_TABLE; 595 630 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_USETIMEANCHOR, name)) { 596 key = "USE_TIMESTAMP_ANCHOR";631 key = SML_DATA_SYNC_CONFIG_USE_TIMESTAMP_ANCHOR; 597 632 /* TODO: Dead option? */ 598 633 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_ONLYREPLACE, name)) { 599 key = "ONLY_REPLACE";634 key = SML_DATA_SYNC_CONFIG_ONLY_REPLACE; 600 635 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_MAXMSGSIZE, name)) { 601 636 if (atoi(val)) 602 key = "MAX_MSG_SIZE";637 key = SML_DATA_SYNC_CONFIG_MAX_MSG_SIZE; 603 638 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_MAXOBJSIZE, name)) { 604 639 if (atoi(val)) 605 key = "MAX_OBJ_SIZE";640 key = SML_DATA_SYNC_CONFIG_MAX_OBJ_SIZE; 606 641 /* XXX Workaround for mobiles which only handle localtime! */ 607 642 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_ONLYLOCALTIME, name)) { 608 key = "ONLY_LOCALTIME";643 key = SML_DATA_SYNC_CONFIG_USE_LOCALTIME; 609 644 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_PROXY, name)) { 610 key = "PROXY";645 key = SML_TRANSPORT_CONFIG_PROXY; 611 646 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_PATH, name)) { 612 647 /* build URL together with connection config */ 613 648 char *value = g_strdup_printf("%s%s", url, val); 614 649 safe_cfree(&url); 615 if (!smlDataSyncSetOption(dsObject, "URL", value, &error)) { 650 if (!smlDataSyncSetOption( 651 dsObject, 652 SML_TRANSPORT_CONFIG_URL, 653 value, &error)) { 616 654 safe_cfree(&value); 617 655 goto error; … … 619 657 safe_cfree(&value); 620 658 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_CAFILE, name)) { 621 key = "SSL_CA_FILE";659 key = SML_TRANSPORT_CONFIG_SSL_CA_FILE; 622 660 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_AUTH_TYPE, name)) { 623 key = "AUTH_TYPE";661 key = SML_DATA_SYNC_CONFIG_AUTH_TYPE; 624 662 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_FAKE_DEVICE, name)) { 625 key = "FAKE_DEVICE";663 key = SML_DATA_SYNC_CONFIG_FAKE_DEVICE; 626 664 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_FAKE_MANUFACTURER, name)) { 627 key = "FAKE_MANUFACTURER";665 key = SML_DATA_SYNC_CONFIG_FAKE_MANUFACTURER; 628 666 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_FAKE_MODEL, name)) { 629 key = "FAKE_MODEL";667 key = SML_DATA_SYNC_CONFIG_FAKE_MODEL; 630 668 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_FAKE_SOFTWARE_VERSION, name)) { 631 key = "FAKE_SOFTWARE_VERSION";669 key = SML_DATA_SYNC_CONFIG_FAKE_SOFTWARE_VERSION; 632 670 } 633 671 -
plugins/syncml/src/syncml_common.h
r3603 r3638 43 43 #include <glib.h> 44 44 45 #include <libsyncml/data_sync_api/defines.h> 45 46 #include <libsyncml/data_sync_api/standard.h> 46 47 … … 48 49 #include <libxml/parser.h> 49 50 50 /* Define limits for large object support: 51 * 52 * MaxMsgSize => 10kB 53 * MaxObjSize => 10MB 54 */ 55 #define OSYNC_PLUGIN_SYNCML_MAX_MSG_SIZE "10240" 56 #define OSYNC_PLUGIN_SYNCML_MAX_OBJ_SIZE "10240000" 51 /* The default limits are taken from libsyncml. */ 52 #define OSYNC_PLUGIN_SYNCML_MAX_MSG_SIZE "SML_DEFAULT_MAX_MSG_SIZE" 53 #define OSYNC_PLUGIN_SYNCML_MAX_OBJ_SIZE "SML_DEFAULT_MAX_OBJ_SIZE" 57 54 58 55 #define SYNCML_PLUGIN_CONFIG_SANVERSION "SANVersion" -
plugins/syncml/src/syncml_obex_client.c
r3611 r3638 39 39 40 40 char *objtype = g_ascii_strup(osync_objformat_get_objtype(database->objformat), -1); 41 if (!smlDataSyncSetOption(env->dsObject1, "DATASTORE", objtype, &error))41 if (!smlDataSyncSetOption(env->dsObject1, SML_TRANSPORT_CONFIG_DATASTORE, objtype, &error)) 42 42 { 43 43 safe_cfree(&objtype);
