From 0c6a185107f673759af905114f534e1f4442e028 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 5 Dec 2024 17:17:21 +0100 Subject: [PATCH 1/3] clang-format: import form linux-6.12 --- .clang-format | 764 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 764 insertions(+) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..e848185 --- /dev/null +++ b/.clang-format @@ -0,0 +1,764 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# clang-format configuration file. Intended for clang-format >= 11. +# +# For more information, see: +# +# Documentation/dev-tools/clang-format.rst +# https://clang.llvm.org/docs/ClangFormat.html +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: Left +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +BreakBeforeInheritanceComma: false +BreakBeforeTernaryOperators: false +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeComma +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 1220 +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: false + +# Taken from: +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ tools/ \ +# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ +# | LC_ALL=C sort -u +ForEachMacros: + - '__ata_qc_for_each' + - '__bio_for_each_bvec' + - '__bio_for_each_segment' + - '__evlist__for_each_entry' + - '__evlist__for_each_entry_continue' + - '__evlist__for_each_entry_from' + - '__evlist__for_each_entry_reverse' + - '__evlist__for_each_entry_safe' + - '__for_each_mem_range' + - '__for_each_mem_range_rev' + - '__for_each_thread' + - '__hlist_for_each_rcu' + - '__map__for_each_symbol_by_name' + - '__pci_bus_for_each_res0' + - '__pci_bus_for_each_res1' + - '__pci_dev_for_each_res0' + - '__pci_dev_for_each_res1' + - '__perf_evlist__for_each_entry' + - '__perf_evlist__for_each_entry_reverse' + - '__perf_evlist__for_each_entry_safe' + - '__rq_for_each_bio' + - '__shost_for_each_device' + - '__sym_for_each' + - 'apei_estatus_for_each_section' + - 'ata_for_each_dev' + - 'ata_for_each_link' + - 'ata_qc_for_each' + - 'ata_qc_for_each_raw' + - 'ata_qc_for_each_with_internal' + - 'ax25_for_each' + - 'ax25_uid_for_each' + - 'bio_for_each_bvec' + - 'bio_for_each_bvec_all' + - 'bio_for_each_folio_all' + - 'bio_for_each_integrity_vec' + - 'bio_for_each_segment' + - 'bio_for_each_segment_all' + - 'bio_list_for_each' + - 'bip_for_each_vec' + - 'bond_for_each_slave' + - 'bond_for_each_slave_rcu' + - 'bpf_for_each' + - 'bpf_for_each_reg_in_vstate' + - 'bpf_for_each_reg_in_vstate_mask' + - 'bpf_for_each_spilled_reg' + - 'bpf_object__for_each_map' + - 'bpf_object__for_each_program' + - 'btree_for_each_safe128' + - 'btree_for_each_safe32' + - 'btree_for_each_safe64' + - 'btree_for_each_safel' + - 'card_for_each_dev' + - 'cgroup_taskset_for_each' + - 'cgroup_taskset_for_each_leader' + - 'cpu_aggr_map__for_each_idx' + - 'cpufreq_for_each_efficient_entry_idx' + - 'cpufreq_for_each_entry' + - 'cpufreq_for_each_entry_idx' + - 'cpufreq_for_each_valid_entry' + - 'cpufreq_for_each_valid_entry_idx' + - 'css_for_each_child' + - 'css_for_each_descendant_post' + - 'css_for_each_descendant_pre' + - 'damon_for_each_region' + - 'damon_for_each_region_from' + - 'damon_for_each_region_safe' + - 'damon_for_each_scheme' + - 'damon_for_each_scheme_safe' + - 'damon_for_each_target' + - 'damon_for_each_target_safe' + - 'damos_for_each_filter' + - 'damos_for_each_filter_safe' + - 'damos_for_each_quota_goal' + - 'damos_for_each_quota_goal_safe' + - 'data__for_each_file' + - 'data__for_each_file_new' + - 'data__for_each_file_start' + - 'device_for_each_child_node' + - 'device_for_each_child_node_scoped' + - 'dma_fence_array_for_each' + - 'dma_fence_chain_for_each' + - 'dma_fence_unwrap_for_each' + - 'dma_resv_for_each_fence' + - 'dma_resv_for_each_fence_unlocked' + - 'do_for_each_ftrace_op' + - 'drm_atomic_crtc_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane_state' + - 'drm_atomic_for_each_plane_damage' + - 'drm_client_for_each_connector_iter' + - 'drm_client_for_each_modeset' + - 'drm_connector_for_each_possible_encoder' + - 'drm_exec_for_each_locked_object' + - 'drm_exec_for_each_locked_object_reverse' + - 'drm_for_each_bridge_in_chain' + - 'drm_for_each_connector_iter' + - 'drm_for_each_crtc' + - 'drm_for_each_crtc_reverse' + - 'drm_for_each_encoder' + - 'drm_for_each_encoder_mask' + - 'drm_for_each_fb' + - 'drm_for_each_legacy_plane' + - 'drm_for_each_plane' + - 'drm_for_each_plane_mask' + - 'drm_for_each_privobj' + - 'drm_gem_for_each_gpuvm_bo' + - 'drm_gem_for_each_gpuvm_bo_safe' + - 'drm_gpuva_for_each_op' + - 'drm_gpuva_for_each_op_from_reverse' + - 'drm_gpuva_for_each_op_reverse' + - 'drm_gpuva_for_each_op_safe' + - 'drm_gpuvm_bo_for_each_va' + - 'drm_gpuvm_bo_for_each_va_safe' + - 'drm_gpuvm_for_each_va' + - 'drm_gpuvm_for_each_va_range' + - 'drm_gpuvm_for_each_va_range_safe' + - 'drm_gpuvm_for_each_va_safe' + - 'drm_mm_for_each_hole' + - 'drm_mm_for_each_node' + - 'drm_mm_for_each_node_in_range' + - 'drm_mm_for_each_node_safe' + - 'dsa_switch_for_each_available_port' + - 'dsa_switch_for_each_cpu_port' + - 'dsa_switch_for_each_cpu_port_continue_reverse' + - 'dsa_switch_for_each_port' + - 'dsa_switch_for_each_port_continue_reverse' + - 'dsa_switch_for_each_port_safe' + - 'dsa_switch_for_each_user_port' + - 'dsa_switch_for_each_user_port_continue_reverse' + - 'dsa_tree_for_each_cpu_port' + - 'dsa_tree_for_each_user_port' + - 'dsa_tree_for_each_user_port_continue_reverse' + - 'dso__for_each_symbol' + - 'elf_hash_for_each_possible' + - 'elf_symtab__for_each_symbol' + - 'evlist__for_each_cpu' + - 'evlist__for_each_entry' + - 'evlist__for_each_entry_continue' + - 'evlist__for_each_entry_from' + - 'evlist__for_each_entry_reverse' + - 'evlist__for_each_entry_safe' + - 'flow_action_for_each' + - 'for_each_acpi_consumer_dev' + - 'for_each_acpi_dev_match' + - 'for_each_active_dev_scope' + - 'for_each_active_drhd_unit' + - 'for_each_active_iommu' + - 'for_each_active_route' + - 'for_each_aggr_pgid' + - 'for_each_and_bit' + - 'for_each_andnot_bit' + - 'for_each_available_child_of_node' + - 'for_each_available_child_of_node_scoped' + - 'for_each_bench' + - 'for_each_bio' + - 'for_each_board_func_rsrc' + - 'for_each_btf_ext_rec' + - 'for_each_btf_ext_sec' + - 'for_each_bvec' + - 'for_each_card_auxs' + - 'for_each_card_auxs_safe' + - 'for_each_card_components' + - 'for_each_card_dapms' + - 'for_each_card_pre_auxs' + - 'for_each_card_prelinks' + - 'for_each_card_rtds' + - 'for_each_card_rtds_safe' + - 'for_each_card_widgets' + - 'for_each_card_widgets_safe' + - 'for_each_cgroup_storage_type' + - 'for_each_child_of_node' + - 'for_each_child_of_node_scoped' + - 'for_each_clear_bit' + - 'for_each_clear_bit_from' + - 'for_each_clear_bitrange' + - 'for_each_clear_bitrange_from' + - 'for_each_cmd' + - 'for_each_cmsghdr' + - 'for_each_collection' + - 'for_each_comp_order' + - 'for_each_compatible_node' + - 'for_each_component_dais' + - 'for_each_component_dais_safe' + - 'for_each_conduit' + - 'for_each_console' + - 'for_each_console_srcu' + - 'for_each_cpu' + - 'for_each_cpu_and' + - 'for_each_cpu_andnot' + - 'for_each_cpu_from' + - 'for_each_cpu_or' + - 'for_each_cpu_wrap' + - 'for_each_dapm_widgets' + - 'for_each_dedup_cand' + - 'for_each_dev_addr' + - 'for_each_dev_scope' + - 'for_each_dma_cap_mask' + - 'for_each_dpcm_be' + - 'for_each_dpcm_be_rollback' + - 'for_each_dpcm_be_safe' + - 'for_each_dpcm_fe' + - 'for_each_drhd_unit' + - 'for_each_dss_dev' + - 'for_each_efi_memory_desc' + - 'for_each_efi_memory_desc_in_map' + - 'for_each_element' + - 'for_each_element_extid' + - 'for_each_element_id' + - 'for_each_enabled_cpu' + - 'for_each_endpoint_of_node' + - 'for_each_event' + - 'for_each_event_tps' + - 'for_each_evictable_lru' + - 'for_each_fib6_node_rt_rcu' + - 'for_each_fib6_walker_rt' + - 'for_each_file_lock' + - 'for_each_free_mem_pfn_range_in_zone_from' + - 'for_each_free_mem_range' + - 'for_each_free_mem_range_reverse' + - 'for_each_func_rsrc' + - 'for_each_gpiochip_node' + - 'for_each_group_evsel' + - 'for_each_group_evsel_head' + - 'for_each_group_member' + - 'for_each_group_member_head' + - 'for_each_hstate' + - 'for_each_hwgpio' + - 'for_each_if' + - 'for_each_inject_fn' + - 'for_each_insn' + - 'for_each_insn_op_loc' + - 'for_each_insn_prefix' + - 'for_each_intid' + - 'for_each_iommu' + - 'for_each_ip_tunnel_rcu' + - 'for_each_irq_nr' + - 'for_each_lang' + - 'for_each_link_ch_maps' + - 'for_each_link_codecs' + - 'for_each_link_cpus' + - 'for_each_link_platforms' + - 'for_each_lru' + - 'for_each_matching_node' + - 'for_each_matching_node_and_match' + - 'for_each_media_entity_data_link' + - 'for_each_mem_pfn_range' + - 'for_each_mem_range' + - 'for_each_mem_range_rev' + - 'for_each_mem_region' + - 'for_each_member' + - 'for_each_memory' + - 'for_each_migratetype_order' + - 'for_each_missing_reg' + - 'for_each_mle_subelement' + - 'for_each_mod_mem_type' + - 'for_each_net' + - 'for_each_net_continue_reverse' + - 'for_each_net_rcu' + - 'for_each_netdev' + - 'for_each_netdev_continue' + - 'for_each_netdev_continue_rcu' + - 'for_each_netdev_continue_reverse' + - 'for_each_netdev_dump' + - 'for_each_netdev_feature' + - 'for_each_netdev_in_bond_rcu' + - 'for_each_netdev_rcu' + - 'for_each_netdev_reverse' + - 'for_each_netdev_safe' + - 'for_each_new_connector_in_state' + - 'for_each_new_crtc_in_state' + - 'for_each_new_mst_mgr_in_state' + - 'for_each_new_plane_in_state' + - 'for_each_new_plane_in_state_reverse' + - 'for_each_new_private_obj_in_state' + - 'for_each_new_reg' + - 'for_each_nhlt_endpoint' + - 'for_each_nhlt_endpoint_fmtcfg' + - 'for_each_nhlt_fmtcfg' + - 'for_each_node' + - 'for_each_node_by_name' + - 'for_each_node_by_type' + - 'for_each_node_mask' + - 'for_each_node_state' + - 'for_each_node_with_cpus' + - 'for_each_node_with_property' + - 'for_each_nonreserved_multicast_dest_pgid' + - 'for_each_numa_hop_mask' + - 'for_each_of_allnodes' + - 'for_each_of_allnodes_from' + - 'for_each_of_cpu_node' + - 'for_each_of_pci_range' + - 'for_each_old_connector_in_state' + - 'for_each_old_crtc_in_state' + - 'for_each_old_mst_mgr_in_state' + - 'for_each_old_plane_in_state' + - 'for_each_old_private_obj_in_state' + - 'for_each_oldnew_connector_in_state' + - 'for_each_oldnew_crtc_in_state' + - 'for_each_oldnew_mst_mgr_in_state' + - 'for_each_oldnew_plane_in_state' + - 'for_each_oldnew_plane_in_state_reverse' + - 'for_each_oldnew_private_obj_in_state' + - 'for_each_online_cpu' + - 'for_each_online_node' + - 'for_each_online_pgdat' + - 'for_each_or_bit' + - 'for_each_path' + - 'for_each_pci_bridge' + - 'for_each_pci_dev' + - 'for_each_pcm_streams' + - 'for_each_physmem_range' + - 'for_each_populated_zone' + - 'for_each_possible_cpu' + - 'for_each_present_blessed_reg' + - 'for_each_present_cpu' + - 'for_each_prime_number' + - 'for_each_prime_number_from' + - 'for_each_probe_cache_entry' + - 'for_each_process' + - 'for_each_process_thread' + - 'for_each_prop_codec_conf' + - 'for_each_prop_dai_codec' + - 'for_each_prop_dai_cpu' + - 'for_each_prop_dlc_codecs' + - 'for_each_prop_dlc_cpus' + - 'for_each_prop_dlc_platforms' + - 'for_each_property_of_node' + - 'for_each_reg' + - 'for_each_reg_filtered' + - 'for_each_reloc' + - 'for_each_reloc_from' + - 'for_each_requested_gpio' + - 'for_each_requested_gpio_in_range' + - 'for_each_reserved_child_of_node' + - 'for_each_reserved_mem_range' + - 'for_each_reserved_mem_region' + - 'for_each_rtd_ch_maps' + - 'for_each_rtd_codec_dais' + - 'for_each_rtd_components' + - 'for_each_rtd_cpu_dais' + - 'for_each_rtd_dais' + - 'for_each_rtd_dais_reverse' + - 'for_each_sband_iftype_data' + - 'for_each_script' + - 'for_each_sec' + - 'for_each_set_bit' + - 'for_each_set_bit_from' + - 'for_each_set_bit_wrap' + - 'for_each_set_bitrange' + - 'for_each_set_bitrange_from' + - 'for_each_set_clump8' + - 'for_each_sg' + - 'for_each_sg_dma_page' + - 'for_each_sg_page' + - 'for_each_sgtable_dma_page' + - 'for_each_sgtable_dma_sg' + - 'for_each_sgtable_page' + - 'for_each_sgtable_sg' + - 'for_each_sibling_event' + - 'for_each_sta_active_link' + - 'for_each_subelement' + - 'for_each_subelement_extid' + - 'for_each_subelement_id' + - 'for_each_sublist' + - 'for_each_subsystem' + - 'for_each_supported_activate_fn' + - 'for_each_supported_inject_fn' + - 'for_each_sym' + - 'for_each_test' + - 'for_each_thread' + - 'for_each_token' + - 'for_each_unicast_dest_pgid' + - 'for_each_valid_link' + - 'for_each_vif_active_link' + - 'for_each_vma' + - 'for_each_vma_range' + - 'for_each_vsi' + - 'for_each_wakeup_source' + - 'for_each_zone' + - 'for_each_zone_zonelist' + - 'for_each_zone_zonelist_nodemask' + - 'func_for_each_insn' + - 'fwnode_for_each_available_child_node' + - 'fwnode_for_each_child_node' + - 'fwnode_for_each_parent_node' + - 'fwnode_graph_for_each_endpoint' + - 'gadget_for_each_ep' + - 'genradix_for_each' + - 'genradix_for_each_from' + - 'genradix_for_each_reverse' + - 'hash_for_each' + - 'hash_for_each_possible' + - 'hash_for_each_possible_rcu' + - 'hash_for_each_possible_rcu_notrace' + - 'hash_for_each_possible_safe' + - 'hash_for_each_rcu' + - 'hash_for_each_safe' + - 'hashmap__for_each_entry' + - 'hashmap__for_each_entry_safe' + - 'hashmap__for_each_key_entry' + - 'hashmap__for_each_key_entry_safe' + - 'hctx_for_each_ctx' + - 'hists__for_each_format' + - 'hists__for_each_sort_list' + - 'hlist_bl_for_each_entry' + - 'hlist_bl_for_each_entry_rcu' + - 'hlist_bl_for_each_entry_safe' + - 'hlist_for_each' + - 'hlist_for_each_entry' + - 'hlist_for_each_entry_continue' + - 'hlist_for_each_entry_continue_rcu' + - 'hlist_for_each_entry_continue_rcu_bh' + - 'hlist_for_each_entry_from' + - 'hlist_for_each_entry_from_rcu' + - 'hlist_for_each_entry_rcu' + - 'hlist_for_each_entry_rcu_bh' + - 'hlist_for_each_entry_rcu_notrace' + - 'hlist_for_each_entry_safe' + - 'hlist_for_each_entry_srcu' + - 'hlist_for_each_safe' + - 'hlist_nulls_for_each_entry' + - 'hlist_nulls_for_each_entry_from' + - 'hlist_nulls_for_each_entry_rcu' + - 'hlist_nulls_for_each_entry_safe' + - 'i3c_bus_for_each_i2cdev' + - 'i3c_bus_for_each_i3cdev' + - 'idr_for_each_entry' + - 'idr_for_each_entry_continue' + - 'idr_for_each_entry_continue_ul' + - 'idr_for_each_entry_ul' + - 'in_dev_for_each_ifa_rcu' + - 'in_dev_for_each_ifa_rtnl' + - 'inet_bind_bucket_for_each' + - 'interval_tree_for_each_span' + - 'intlist__for_each_entry' + - 'intlist__for_each_entry_safe' + - 'kcore_copy__for_each_phdr' + - 'key_for_each' + - 'key_for_each_safe' + - 'klp_for_each_func' + - 'klp_for_each_func_safe' + - 'klp_for_each_func_static' + - 'klp_for_each_object' + - 'klp_for_each_object_safe' + - 'klp_for_each_object_static' + - 'kunit_suite_for_each_test_case' + - 'kvm_for_each_memslot' + - 'kvm_for_each_memslot_in_gfn_range' + - 'kvm_for_each_vcpu' + - 'libbpf_nla_for_each_attr' + - 'list_for_each' + - 'list_for_each_codec' + - 'list_for_each_codec_safe' + - 'list_for_each_continue' + - 'list_for_each_entry' + - 'list_for_each_entry_continue' + - 'list_for_each_entry_continue_rcu' + - 'list_for_each_entry_continue_reverse' + - 'list_for_each_entry_from' + - 'list_for_each_entry_from_rcu' + - 'list_for_each_entry_from_reverse' + - 'list_for_each_entry_lockless' + - 'list_for_each_entry_rcu' + - 'list_for_each_entry_reverse' + - 'list_for_each_entry_safe' + - 'list_for_each_entry_safe_continue' + - 'list_for_each_entry_safe_from' + - 'list_for_each_entry_safe_reverse' + - 'list_for_each_entry_srcu' + - 'list_for_each_from' + - 'list_for_each_prev' + - 'list_for_each_prev_safe' + - 'list_for_each_rcu' + - 'list_for_each_reverse' + - 'list_for_each_safe' + - 'llist_for_each' + - 'llist_for_each_entry' + - 'llist_for_each_entry_safe' + - 'llist_for_each_safe' + - 'lwq_for_each_safe' + - 'map__for_each_symbol' + - 'map__for_each_symbol_by_name' + - 'mas_for_each' + - 'mci_for_each_dimm' + - 'media_device_for_each_entity' + - 'media_device_for_each_intf' + - 'media_device_for_each_link' + - 'media_device_for_each_pad' + - 'media_entity_for_each_pad' + - 'media_pipeline_for_each_entity' + - 'media_pipeline_for_each_pad' + - 'mlx5_lag_for_each_peer_mdev' + - 'msi_domain_for_each_desc' + - 'msi_for_each_desc' + - 'mt_for_each' + - 'nanddev_io_for_each_page' + - 'netdev_for_each_lower_dev' + - 'netdev_for_each_lower_private' + - 'netdev_for_each_lower_private_rcu' + - 'netdev_for_each_mc_addr' + - 'netdev_for_each_synced_mc_addr' + - 'netdev_for_each_synced_uc_addr' + - 'netdev_for_each_uc_addr' + - 'netdev_for_each_upper_dev_rcu' + - 'netdev_hw_addr_list_for_each' + - 'nft_rule_for_each_expr' + - 'nla_for_each_attr' + - 'nla_for_each_attr_type' + - 'nla_for_each_nested' + - 'nla_for_each_nested_type' + - 'nlmsg_for_each_attr' + - 'nlmsg_for_each_msg' + - 'nr_neigh_for_each' + - 'nr_neigh_for_each_safe' + - 'nr_node_for_each' + - 'nr_node_for_each_safe' + - 'of_for_each_phandle' + - 'of_property_for_each_string' + - 'of_property_for_each_u32' + - 'pci_bus_for_each_resource' + - 'pci_dev_for_each_resource' + - 'pcl_for_each_chunk' + - 'pcl_for_each_segment' + - 'pcm_for_each_format' + - 'perf_config_items__for_each_entry' + - 'perf_config_sections__for_each_entry' + - 'perf_config_set__for_each_entry' + - 'perf_cpu_map__for_each_cpu' + - 'perf_cpu_map__for_each_cpu_skip_any' + - 'perf_cpu_map__for_each_idx' + - 'perf_evlist__for_each_entry' + - 'perf_evlist__for_each_entry_reverse' + - 'perf_evlist__for_each_entry_safe' + - 'perf_evlist__for_each_evsel' + - 'perf_evlist__for_each_mmap' + - 'perf_hpp_list__for_each_format' + - 'perf_hpp_list__for_each_format_safe' + - 'perf_hpp_list__for_each_sort_list' + - 'perf_hpp_list__for_each_sort_list_safe' + - 'perf_tool_event__for_each_event' + - 'plist_for_each' + - 'plist_for_each_continue' + - 'plist_for_each_entry' + - 'plist_for_each_entry_continue' + - 'plist_for_each_entry_safe' + - 'plist_for_each_safe' + - 'pnp_for_each_card' + - 'pnp_for_each_dev' + - 'protocol_for_each_card' + - 'protocol_for_each_dev' + - 'queue_for_each_hw_ctx' + - 'radix_tree_for_each_slot' + - 'radix_tree_for_each_tagged' + - 'rb_for_each' + - 'rbtree_postorder_for_each_entry_safe' + - 'rdma_for_each_block' + - 'rdma_for_each_port' + - 'rdma_umem_for_each_dma_block' + - 'resort_rb__for_each_entry' + - 'resource_list_for_each_entry' + - 'resource_list_for_each_entry_safe' + - 'rhl_for_each_entry_rcu' + - 'rhl_for_each_rcu' + - 'rht_for_each' + - 'rht_for_each_entry' + - 'rht_for_each_entry_from' + - 'rht_for_each_entry_rcu' + - 'rht_for_each_entry_rcu_from' + - 'rht_for_each_entry_safe' + - 'rht_for_each_from' + - 'rht_for_each_rcu' + - 'rht_for_each_rcu_from' + - 'rq_for_each_bvec' + - 'rq_for_each_segment' + - 'rq_list_for_each' + - 'rq_list_for_each_safe' + - 'sample_read_group__for_each' + - 'scsi_for_each_prot_sg' + - 'scsi_for_each_sg' + - 'sctp_for_each_hentry' + - 'sctp_skb_for_each' + - 'sec_for_each_insn' + - 'sec_for_each_insn_continue' + - 'sec_for_each_insn_from' + - 'sec_for_each_sym' + - 'shdma_for_each_chan' + - 'shost_for_each_device' + - 'sk_for_each' + - 'sk_for_each_bound' + - 'sk_for_each_entry_offset_rcu' + - 'sk_for_each_from' + - 'sk_for_each_rcu' + - 'sk_for_each_safe' + - 'sk_nulls_for_each' + - 'sk_nulls_for_each_from' + - 'sk_nulls_for_each_rcu' + - 'snd_array_for_each' + - 'snd_pcm_group_for_each_entry' + - 'snd_soc_dapm_widget_for_each_path' + - 'snd_soc_dapm_widget_for_each_path_safe' + - 'snd_soc_dapm_widget_for_each_sink_path' + - 'snd_soc_dapm_widget_for_each_source_path' + - 'sparsebit_for_each_set_range' + - 'strlist__for_each_entry' + - 'strlist__for_each_entry_safe' + - 'sym_for_each_insn' + - 'sym_for_each_insn_continue_reverse' + - 'symbols__for_each_entry' + - 'tb_property_for_each' + - 'tcf_act_for_each_action' + - 'tcf_exts_for_each_action' + - 'ttm_resource_manager_for_each_res' + - 'udp_portaddr_for_each_entry' + - 'udp_portaddr_for_each_entry_rcu' + - 'usb_hub_for_each_child' + - 'v4l2_device_for_each_subdev' + - 'v4l2_m2m_for_each_dst_buf' + - 'v4l2_m2m_for_each_dst_buf_safe' + - 'v4l2_m2m_for_each_src_buf' + - 'v4l2_m2m_for_each_src_buf_safe' + - 'virtio_device_for_each_vq' + - 'while_for_each_ftrace_op' + - 'xa_for_each' + - 'xa_for_each_marked' + - 'xa_for_each_range' + - 'xa_for_each_start' + - 'xas_for_each' + - 'xas_for_each_conflict' + - 'xas_for_each_marked' + - 'xbc_array_for_each_value' + - 'xbc_for_each_key_value' + - 'xbc_node_for_each_array_value' + - 'xbc_node_for_each_child' + - 'xbc_node_for_each_key_value' + - 'xbc_node_for_each_subkey' + - 'ynl_attr_for_each' + - 'ynl_attr_for_each_nested' + - 'ynl_attr_for_each_payload' + - 'zorro_for_each_dev' + +IncludeBlocks: Preserve +IncludeCategories: + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +IndentGotoLabels: false +IndentPPDirectives: None +IndentWidth: 8 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBinPackProtocolList: Auto +ObjCBlockIndentWidth: 8 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true + +# Taken from git's rules +PenaltyBreakAssignment: 10 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +SortUsingDeclarations: false +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeParens: ControlStatementsExceptForEachMacros +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp03 +TabWidth: 8 +UseTab: Always +... From 98c8aa5ee4932468d42fd249de0b1315a3767254 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 5 Dec 2024 18:05:39 +0100 Subject: [PATCH 2/3] socketcandcl: requite semicolon after PRINT_*() macros Similar to ef4460783153 ("Fix compiler warnings"). --- socketcandcl.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/socketcandcl.c b/socketcandcl.c index 66cd3e6..7571755 100644 --- a/socketcandcl.c +++ b/socketcandcl.c @@ -75,9 +75,18 @@ #define STATE_CONNECTED 1 #define STATE_SHUTDOWN 2 -#define PRINT_INFO(...) printf(__VA_ARGS__); -#define PRINT_ERROR(...) fprintf(stderr, __VA_ARGS__); -#define PRINT_VERBOSE(...) printf(__VA_ARGS__); +#define PRINT_INFO(...) \ + do { \ + printf(__VA_ARGS__); \ + } while (0) +#define PRINT_ERROR(...) \ + do { \ + fprintf(stderr, __VA_ARGS__); \ + } while (0) +#define PRINT_VERBOSE(...) \ + do { \ + printf(__VA_ARGS__); \ + } while (0) void print_usage(void); void sigint(); @@ -355,8 +364,8 @@ inline void state_connected() ret = select(server_socket+1, &readfds, NULL, NULL, NULL); if(ret < 0) { - PRINT_ERROR("Error in select()\n") - state = STATE_SHUTDOWN; + PRINT_ERROR("Error in select()\n"); + state = STATE_SHUTDOWN; return; } } @@ -410,16 +419,16 @@ inline void state_connected() ret = select(raw_socket+1, &readfds, NULL, NULL, NULL); if(ret < 0) { - PRINT_ERROR("Error in select()\n") - state = STATE_SHUTDOWN; + PRINT_ERROR("Error in select()\n"); + state = STATE_SHUTDOWN; return; } if(FD_ISSET(raw_socket, &readfds)) { ret = recv(raw_socket, &frame, sizeof(struct can_frame), MSG_WAITALL); if(ret < sizeof(struct can_frame)) { - PRINT_ERROR("Error reading frame from RAW socket\n") - perror("Reading CAN socket\n"); + PRINT_ERROR("Error reading frame from RAW socket\n"); + perror("Reading CAN socket\n"); } else { if(frame.can_id & CAN_ERR_FLAG) { /* TODO implement */ @@ -571,18 +580,18 @@ void childdied() void sigint() { if(verbose_flag) - PRINT_ERROR("received SIGINT\n") + PRINT_ERROR("received SIGINT\n"); - if(server_socket != -1) { - if(verbose_flag) - PRINT_INFO("closing server socket\n") - close(server_socket); - } + if (server_socket != -1) { + if (verbose_flag) + PRINT_INFO("closing server socket\n"); + close(server_socket); + } if(raw_socket != -1) { if(verbose_flag) - PRINT_INFO("closing can socket\n") - close(raw_socket); + PRINT_INFO("closing can socket\n"); + close(raw_socket); } exit(0); From 906162b13fb9ab3c0265d45d5d2131549c50bb51 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 5 Dec 2024 17:59:14 +0100 Subject: [PATCH 3/3] treewide: convert to kernel coding style --- beacon.c | 31 +++---- canctl.c | 33 ++++--- socketcand.c | 226 ++++++++++++++++++++++++------------------------ socketcand.h | 28 ++++-- socketcandcl.c | 198 +++++++++++++++++++----------------------- state_bcm.c | 156 ++++++++++++++++----------------- state_control.c | 19 ++-- state_isotp.c | 55 ++++++------ state_nobus.c | 46 +++++----- state_raw.c | 69 ++++++++------- statistics.c | 90 +++++++++---------- 11 files changed, 469 insertions(+), 482 deletions(-) diff --git a/beacon.c b/beacon.c index 1bc7bbf..53b8bed 100644 --- a/beacon.c +++ b/beacon.c @@ -14,7 +14,8 @@ #include "socketcand.h" #include "beacon.h" -void *beacon_loop(void *ptr) { +void *beacon_loop(void *ptr) +{ int i, n, chars_left, ret; int udp_socket; int optval; @@ -29,44 +30,44 @@ void *beacon_loop(void *ptr) { /* Activate broadcast option */ optval = 1; ret = setsockopt(udp_socket, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(int)); - if(ret) { + if (ret) { PRINT_ERROR("Could not activate SO_BROADCAST\n"); } /* Connect the socket */ - if(connect(udp_socket, (struct sockaddr *) &broadcast_addr, sizeof(broadcast_addr)) < 0) { + if (connect(udp_socket, (struct sockaddr *)&broadcast_addr, sizeof(broadcast_addr)) < 0) { PRINT_ERROR("Failed to connect broadcast socket"); return NULL; } - while(1) { + while (1) { /* Build the beacon */ - gethostname((char *) &hostname, (size_t) 32); + gethostname((char *)&hostname, (size_t)32); snprintf(buffer, BEACON_LENGTH, "\ncan://%s:%d", - hostname, BEACON_TYPE, description, inet_ntoa( saddr.sin_addr ), port); + hostname, BEACON_TYPE, description, inet_ntoa(saddr.sin_addr), port); - for(i=0;i", interface_names[i]); + snprintf(buffer + (n * sizeof(char)), chars_left, "", interface_names[i]); } - + /* Find \0 in beacon buffer */ - for(n=0;;n++) { - if(buffer[n] == '\0') + for (n = 0;; n++) { + if (buffer[n] == '\0') break; } chars_left = BEACON_LENGTH - n; - snprintf(buffer+(n*sizeof(char)), chars_left, ""); + snprintf(buffer + (n * sizeof(char)), chars_left, ""); ret = send(udp_socket, buffer, strlen(buffer), 0); - if(ret == -1) { + if (ret == -1) { PRINT_ERROR("Error in beacon send()\n"); } sleep(3); diff --git a/canctl.c b/canctl.c index 1133d9a..ec8c188 100644 --- a/canctl.c +++ b/canctl.c @@ -10,18 +10,17 @@ int canctl_set_bittiming(const char *bus_name, const char *buff_bittiming_conf, { int bitrate, sample_point, tq, prop_seg, phase_seg1, phase_seg2, sjw, brp, items; - items = sscanf(buff_bittiming_conf, "< %*s B %d %d %d %d %d %d %d %d >", - &bitrate, - &sample_point, - &tq, - &prop_seg, - &phase_seg1, - &phase_seg2, - &sjw, - &brp - ); - - if (items != 8) { + items = sscanf(buff_bittiming_conf, "< %*s B %d %d %d %d %d %d %d %d >", + &bitrate, + &sample_point, + &tq, + &prop_seg, + &phase_seg1, + &phase_seg2, + &sjw, + &brp); + + if (items != 8) { return -1; } @@ -50,7 +49,7 @@ int canctl_set_bittiming(const char *bus_name, const char *buff_bittiming_conf, if (phase_seg2 >= 0) { bt.phase_seg2 = phase_seg2; } - + if (sjw >= 0) { bt.sjw = sjw; } @@ -66,8 +65,8 @@ int canctl_set_control_modes(const char *bus_name, const char *buff_control_mode { int listen_only, loopback, three_samples, items; - items = sscanf(buff_control_modes_conf, "< %*s C %d %d %d >", - &listen_only, &loopback, &three_samples); + items = sscanf(buff_control_modes_conf, "< %*s C %d %d %d >", + &listen_only, &loopback, &three_samples); if (items != 3) { return -1; @@ -83,6 +82,6 @@ int canctl_set_control_modes(const char *bus_name, const char *buff_control_mode cm.flags |= CAN_CTRLMODE_LOOPBACK; if (three_samples) cm.flags |= CAN_CTRLMODE_3_SAMPLES; - + return !(can_do_stop(bus_name) || can_set_ctrlmode(bus_name, &cm)) ? 0 : -1; -} \ No newline at end of file +} diff --git a/socketcand.c b/socketcand.c index b943233..187e22e 100644 --- a/socketcand.c +++ b/socketcand.c @@ -83,26 +83,26 @@ int receive_command(int socket, char *buf); int sl, client_socket; pthread_t beacon_thread, statistics_thread; char **interface_names; -int interface_count=0; +int interface_count = 0; int port; -int verbose_flag=0; -int daemon_flag=0; -int disable_beacon=0; -int tcp_quickack_flag=0; +int verbose_flag = 0; +int daemon_flag = 0; +int disable_beacon = 0; +int tcp_quickack_flag = 0; int state = STATE_NO_BUS; int previous_state = -1; char bus_name[MAX_BUSNAME]; char cmd_buffer[MAXLEN]; -int cmd_index=0; -char* description; -char* afuxname; +int cmd_index = 0; +char *description; +char *afuxname; int more_elements = 0; struct sockaddr_in saddr, broadcast_addr; struct sockaddr_un unaddr; socklen_t unaddrlen; struct sockaddr_un remote_unaddr; socklen_t remote_unaddrlen; -char* interface_string; +char *interface_string; void tcp_quickack(int s) { @@ -114,13 +114,13 @@ void tcp_quickack(int s) int state_changed(char *buf, int current_state) { - if(!strcmp("< rawmode >", buf)) + if (!strcmp("< rawmode >", buf)) state = STATE_RAW; - else if(!strcmp("< bcmmode >", buf)) + else if (!strcmp("< bcmmode >", buf)) state = STATE_BCM; - else if(!strcmp("< isotpmode >", buf)) + else if (!strcmp("< isotpmode >", buf)) state = STATE_ISOTP; - else if(!strcmp("< controlmode >", buf)) + else if (!strcmp("< controlmode >", buf)) state = STATE_CONTROL; if (current_state != state) @@ -140,8 +140,7 @@ char *element_start(char *buf, int element) * get the position of the requested element as char pointer */ - for (i=0, elem=0; i sizeof(unaddr.sun_path)-3) { + if (strlen(afuxname) > sizeof(unaddr.sun_path) - 3) { printf("afuxname is too long.\n"); exit(1); } @@ -395,26 +389,25 @@ int main(int argc, char **argv) unaddrlen = strlen(afuxname) + sizeof(unaddr.sun_family) + 1; } PRINT_VERBOSE("binding unix socket to '%s' with unaddrlen %d\n", afuxname, unaddrlen); - if(bind(sl,(struct sockaddr*)&unaddr, unaddrlen) < 0) { + if (bind(sl, (struct sockaddr *)&unaddr, unaddrlen) < 0) { perror("unixbind"); exit(-1); } - if (listen(sl,3) != 0) { + if (listen(sl, 3) != 0) { perror("unixlisten"); exit(1); } while (1) { remote_unaddrlen = sizeof(struct sockaddr_un); - client_socket = accept(sl,(struct sockaddr *)&remote_unaddr, &remote_unaddrlen); - if (client_socket > 0 ){ + client_socket = accept(sl, (struct sockaddr *)&remote_unaddr, &remote_unaddrlen); + if (client_socket > 0) { if (fork()) close(client_socket); else break; - } - else { + } else { if (errno != EINTR) { /* * If the cause for the error was NOT the @@ -429,37 +422,36 @@ int main(int argc, char **argv) PRINT_VERBOSE("client connected\n"); } else { - /* create PF_INET socket */ - if((sl = socket(PF_INET, SOCK_STREAM, 0)) < 0) { + if ((sl = socket(PF_INET, SOCK_STREAM, 0)) < 0) { perror("inetsocket"); exit(1); } #ifdef DEBUG - if(verbose_flag) + if (verbose_flag) printf("setting SO_REUSEADDR\n"); i = 1; - if(setsockopt(sl, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)) <0) { + if (setsockopt(sl, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)) < 0) { perror("setting SO_REUSEADDR failed"); } #endif PRINT_VERBOSE("binding socket to %s:%d\n", inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); - if(bind(sl,(struct sockaddr*)&saddr, sizeof(saddr)) < 0) { + if (bind(sl, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) { perror("bind"); exit(-1); } - if (listen(sl,3) != 0) { + if (listen(sl, 3) != 0) { perror("listen"); exit(1); } while (1) { - client_socket = accept(sl,(struct sockaddr *)&clientaddr, &sin_size); - if (client_socket > 0 ){ + client_socket = accept(sl, (struct sockaddr *)&clientaddr, &sin_size); + if (client_socket > 0) { int flag; flag = 1; setsockopt(client_socket, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(flag)); @@ -467,8 +459,7 @@ int main(int argc, char **argv) close(client_socket); else break; - } - else { + } else { if (errno != EINTR) { /* * If the cause for the error was NOT the @@ -485,14 +476,14 @@ int main(int argc, char **argv) #ifdef DEBUG PRINT_VERBOSE("setting SO_REUSEADDR\n"); i = 1; - if(setsockopt(client_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)) <0) { + if (setsockopt(client_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)) < 0) { perror("setting SO_REUSEADDR failed"); } #endif } /* main loop with state machine */ - while(1) { - switch(state) { + while (1) { + switch (state) { case STATE_NO_BUS: state_nobus(); break; @@ -521,14 +512,15 @@ int main(int argc, char **argv) /* reads all available data from the socket into the command buffer. * returns '-1' if no command could be received. */ -int receive_command(int socket, char *buffer) { +int receive_command(int socket, char *buffer) +{ int i, start, stop; /* if there are no more elements in the buffer read more data from the * socket. */ - if(!more_elements) { - cmd_index += read(socket, cmd_buffer+cmd_index, MAXLEN-cmd_index); + if (!more_elements) { + cmd_index += read(socket, cmd_buffer + cmd_index, MAXLEN - cmd_index); tcp_quickack(client_socket); #ifdef DEBUG_RECEPTION PRINT_VERBOSE("\tRead from socket\n"); @@ -543,8 +535,8 @@ int receive_command(int socket, char *buffer) { /* find first '<' in string */ start = -1; - for(i=0;i') { + for (i = 1; i < cmd_index; i++) { + if (cmd_buffer[i] == '>') { stop = i; break; } } /* if no '>' is in the string we have to wait for more data */ - if(stop == -1) { + if (stop == -1) { #ifdef DEBUG_RECEPTION PRINT_VERBOSE("\tNo full element in the buffer\n"); #endif @@ -584,30 +576,30 @@ int receive_command(int socket, char *buffer) { #endif /* copy string to new destination and correct cmd_buffer */ - for(i=start;i<=stop;i++) { - buffer[i-start] = cmd_buffer[i]; + for (i = start; i <= stop; i++) { + buffer[i - start] = cmd_buffer[i]; } - buffer[i-start] = '\0'; + buffer[i - start] = '\0'; #ifdef DEBUG_RECEPTION PRINT_VERBOSE("\tElement is '%s'\n", buffer); #endif /* if only this message was in the buffer we're done */ - if(stop == cmd_index-1) { + if (stop == cmd_index - 1) { cmd_index = 0; } else { /* check if there is a '<' after the stop */ start = -1; - for(i=stop;i') { + for (i = 1; i < cmd_index; i++) { + if (cmd_buffer[i] == '>') { stop = i; break; } } - if(stop != -1) { + if (stop != -1) { more_elements = 1; #ifdef DEBUG_RECEPTION PRINT_VERBOSE("\tMore than one full element in the buffer.\n"); @@ -640,12 +632,13 @@ int receive_command(int socket, char *buffer) { return 0; } -void determine_adress() { +void determine_adress() +{ struct ifreq ifr, ifr_mask; int probe_socket = socket(AF_INET, SOCK_DGRAM, 0); - if(probe_socket < 0) { + if (probe_socket < 0) { PRINT_ERROR("Could not create socket!\n"); exit(-1); } @@ -653,11 +646,11 @@ void determine_adress() { PRINT_VERBOSE("Using network interface '%s'\n", interface_string); ifr.ifr_addr.sa_family = AF_INET; - strncpy(ifr.ifr_name, interface_string, IFNAMSIZ-1); + strncpy(ifr.ifr_name, interface_string, IFNAMSIZ - 1); ioctl(probe_socket, SIOCGIFADDR, &ifr); ifr_mask.ifr_addr.sa_family = AF_INET; - strncpy(ifr_mask.ifr_name, interface_string, IFNAMSIZ-1); + strncpy(ifr_mask.ifr_name, interface_string, IFNAMSIZ - 1); ioctl(probe_socket, SIOCGIFNETMASK, &ifr_mask); close(probe_socket); @@ -667,18 +660,19 @@ void determine_adress() { /* set listen adress */ saddr.sin_family = AF_INET; - saddr.sin_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; + saddr.sin_addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr; saddr.sin_port = htons(port); /* calculate and set broadcast adress */ broadcast_addr.sin_family = AF_INET; - broadcast_addr.sin_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; - broadcast_addr.sin_addr.s_addr |= ~((struct sockaddr_in *) &ifr_mask.ifr_netmask)->sin_addr.s_addr; + broadcast_addr.sin_addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr; + broadcast_addr.sin_addr.s_addr |= ~((struct sockaddr_in *)&ifr_mask.ifr_netmask)->sin_addr.s_addr; broadcast_addr.sin_port = htons(BROADCAST_PORT); PRINT_VERBOSE("Broadcast adress is %s\n", inet_ntoa(broadcast_addr.sin_addr)); } -void print_usage(void) { +void print_usage(void) +{ printf("%s Version %s\n", PACKAGE_NAME, PACKAGE_VERSION); printf("Report bugs to %s\n\n", PACKAGE_BUGREPORT); printf("Usage: socketcand [-v | --verbose] [-i interfaces | --interfaces interfaces]\n\t\t[-p port | --port port] [-q | --quick-ack]\n\t\t[-l interface | --listen interface] [-u name | --afuxname name]\n\t\t[-n | --no-beacon] [-d | --daemon] [-h | --help]\n\n"); @@ -694,29 +688,31 @@ void print_usage(void) { printf("\t-h (prints this message)\n"); } -void childdied() { +void childdied() +{ wait(NULL); } -void sigint() { - if(verbose_flag) +void sigint() +{ + if (verbose_flag) PRINT_ERROR("received SIGINT\n"); - if(sl != -1) { - if(verbose_flag) + if (sl != -1) { + if (verbose_flag) PRINT_INFO("closing listening socket\n"); - if(!close(sl)) + if (!close(sl)) sl = -1; } - if(client_socket != -1) { - if(verbose_flag) + if (client_socket != -1) { + if (verbose_flag) PRINT_INFO("closing client socket\n"); - if(!close(client_socket)) + if (!close(client_socket)) client_socket = -1; } closelog(); exit(0); -} \ No newline at end of file +} diff --git a/socketcand.h b/socketcand.h index cdfc692..5747fcf 100644 --- a/socketcand.h +++ b/socketcand.h @@ -9,7 +9,7 @@ /* receive buffer length from inet socket for an isotp PDU plus command */ #define MAXLEN (2 * ISOTPLEN + 100) /* 4095 * 2 + cmd stuff */ -#define MAX_BUSNAME 16+1 +#define MAX_BUSNAME 16 + 1 #define PORT 29536 #define DEFAULT_INTERFACE "eth0" #define DEFAULT_BUSNAME "vcan0" @@ -21,9 +21,25 @@ #define STATE_CONTROL 4 #define STATE_ISOTP 5 -#define PRINT_INFO(...) do{ if(daemon_flag) syslog(LOG_INFO, __VA_ARGS__); else printf(__VA_ARGS__); } while(0) -#define PRINT_ERROR(...) do{ if(daemon_flag) syslog(LOG_ERR, __VA_ARGS__); else fprintf(stderr, __VA_ARGS__); } while(0) -#define PRINT_VERBOSE(...) do{ if(verbose_flag && !daemon_flag) printf(__VA_ARGS__); } while(0) +#define PRINT_INFO(...) \ + do { \ + if (daemon_flag) \ + syslog(LOG_INFO, __VA_ARGS__); \ + else \ + printf(__VA_ARGS__); \ + } while (0) +#define PRINT_ERROR(...) \ + do { \ + if (daemon_flag) \ + syslog(LOG_ERR, __VA_ARGS__); \ + else \ + fprintf(stderr, __VA_ARGS__); \ + } while (0) +#define PRINT_VERBOSE(...) \ + do { \ + if (verbose_flag && !daemon_flag) \ + printf(__VA_ARGS__); \ + } while (0) #ifndef VERSION_STRING #define VERSION_STRING "SNAPSHOT" @@ -47,8 +63,8 @@ extern int daemon_flag; extern int state; extern int previous_state; extern char bus_name[]; -extern char* description; -extern char* afuxname; +extern char *description; +extern char *afuxname; extern pthread_t statistics_thread; extern int more_elements; extern struct sockaddr_in broadcast_addr; diff --git a/socketcandcl.c b/socketcandcl.c index 7571755..cf7281f 100644 --- a/socketcandcl.c +++ b/socketcandcl.c @@ -96,16 +96,15 @@ void state_connected(); int server_socket; int raw_socket; int port; -int verbose_flag=0; -int cmd_index=0; -int more_elements=0; +int verbose_flag = 0; +int cmd_index = 0; +int more_elements = 0; int state, previous_state; char ldev[IFNAMSIZ]; char rdev[IFNAMSIZ]; char buf[MAXLEN]; char cmd_buffer[MAXLEN]; - int main(int argc, char **argv) { int i; @@ -115,8 +114,8 @@ int main(int argc, char **argv) struct hostent *server_ent; struct sigaction sigint_action; char buf[MAXLEN]; - char* server_string; - char* afuxname; + char *server_string; + char *afuxname; /* set default config settings */ port = PORT; @@ -125,30 +124,29 @@ int main(int argc, char **argv) server_string = malloc(strlen("localhost")); afuxname = NULL; - /* Parse commandline arguments */ - for(;;) { + for (;;) { /* getopt_long stores the option index here. */ int c, option_index = 0; static struct option long_options[] = { - {"verbose", no_argument, 0, 'v'}, - {"interfaces", required_argument, 0, 'i'}, - {"afuxname", required_argument, 0, 'u'}, - {"server", required_argument, 0, 's'}, - {"port", required_argument, 0, 'p'}, - {"version", no_argument, 0, 'z'}, - {0, 0, 0, 0} + { "verbose", no_argument, 0, 'v' }, + { "interfaces", required_argument, 0, 'i' }, + { "afuxname", required_argument, 0, 'u' }, + { "server", required_argument, 0, 's' }, + { "port", required_argument, 0, 'p' }, + { "version", no_argument, 0, 'z' }, + { 0, 0, 0, 0 } }; c = getopt_long(argc, argv, "vhi:p:l:s:u:", long_options, &option_index); - if(c == -1) + if (c == -1) break; - switch(c) { + switch (c) { case 0: /* If this option set a flag, do nothing else now. */ - if(long_options[option_index].flag != 0) + if (long_options[option_index].flag != 0) break; break; @@ -162,12 +160,12 @@ int main(int argc, char **argv) break; case 'u': - afuxname = realloc(afuxname, strlen(optarg)+1); + afuxname = realloc(afuxname, strlen(optarg) + 1); strcpy(afuxname, optarg); break; case 's': - server_string = realloc(server_string, strlen(optarg)+1); + server_string = realloc(server_string, strlen(optarg) + 1); strcpy(server_string, optarg); break; @@ -194,23 +192,21 @@ int main(int argc, char **argv) } } - sigint_action.sa_handler = &sigint; sigemptyset(&sigint_action.sa_mask); sigint_action.sa_flags = 0; sigaction(SIGINT, &sigint_action, NULL); - if (afuxname) { /* create AF_UNIX socket */ server_socket = socket(AF_UNIX, SOCK_STREAM, 0); - if(server_socket < 0) { + if (server_socket < 0) { perror("unixsocket"); exit(1); } serveraddr_un.sun_family = AF_UNIX; - if (strlen(afuxname) > sizeof(serveraddr_un.sun_path)-3) { + if (strlen(afuxname) > sizeof(serveraddr_un.sun_path) - 3) { printf("afuxname is too long.\n"); exit(1); } @@ -231,16 +227,15 @@ int main(int argc, char **argv) serveraddr_un_len = strlen(afuxname) + sizeof(serveraddr_un.sun_family) + 1; } - if(connect(server_socket, (struct sockaddr*)&serveraddr_un, serveraddr_un_len) != 0) { + if (connect(server_socket, (struct sockaddr *)&serveraddr_un, serveraddr_un_len) != 0) { perror("connect"); exit(1); } - } - else { + } else { /* create AF_INET socket */ server_socket = socket(AF_INET, SOCK_STREAM, 0); - if(server_socket < 0) { + if (server_socket < 0) { perror("socket"); exit(1); } @@ -250,36 +245,34 @@ int main(int argc, char **argv) serveraddr.sin_port = htons(port); server_ent = gethostbyname(server_string); - if(server_ent == 0) { + if (server_ent == 0) { perror(server_string); exit(1); } memcpy(&(serveraddr.sin_addr.s_addr), server_ent->h_addr, - server_ent->h_length); - + server_ent->h_length); - if(connect(server_socket, (struct sockaddr*)&serveraddr, - sizeof(serveraddr)) != 0) { + if (connect(server_socket, (struct sockaddr *)&serveraddr, + sizeof(serveraddr)) != 0) { perror("connect"); exit(1); } } - - for(;;) { - switch(state) { + for (;;) { + switch (state) { case STATE_INIT: /* has to start with a command */ - i = receive_command(server_socket, (char *) &buf); - if(i != 0) { + i = receive_command(server_socket, (char *)&buf); + if (i != 0) { PRINT_ERROR("Connection terminated while waiting for command.\n"); state = STATE_SHUTDOWN; previous_state = STATE_INIT; break; } - if(!strncmp("< hi", buf, 4)) { + if (!strncmp("< hi", buf, 4)) { /* send open and rawmode command */ sprintf(buf, "< open %s >", rdev); send(server_socket, buf, strlen(buf), 0); @@ -303,26 +296,23 @@ int main(int argc, char **argv) return 0; } - inline void state_connected() { - int ret; static struct can_frame frame; static struct ifreq ifr; static struct sockaddr_can addr; fd_set readfds; - if(previous_state != STATE_CONNECTED) { - - if((raw_socket = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) { + if (previous_state != STATE_CONNECTED) { + if ((raw_socket = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) { PRINT_ERROR("Error while creating RAW socket %s\n", strerror(errno)); state = STATE_SHUTDOWN; return; } strcpy(ifr.ifr_name, ldev); - if(ioctl(raw_socket, SIOCGIFINDEX, &ifr) < 0) { + if (ioctl(raw_socket, SIOCGIFINDEX, &ifr) < 0) { PRINT_ERROR("Error while searching for bus %s\n", strerror(errno)); state = STATE_SHUTDOWN; return; @@ -333,14 +323,14 @@ inline void state_connected() /* turn on timestamp */ const int timestamp_on = 0; - if(setsockopt(raw_socket, SOL_SOCKET, SO_TIMESTAMP, - ×tamp_on, sizeof(timestamp_on)) < 0) { + if (setsockopt(raw_socket, SOL_SOCKET, SO_TIMESTAMP, + ×tamp_on, sizeof(timestamp_on)) < 0) { PRINT_ERROR("Could not enable CAN timestamps\n"); state = STATE_SHUTDOWN; return; } /* bind socket */ - if(bind(raw_socket, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + if (bind(raw_socket, (struct sockaddr *)&addr, sizeof(addr)) < 0) { PRINT_ERROR("Error while binding RAW socket %s\n", strerror(errno)); state = STATE_SHUTDOWN; return; @@ -348,11 +338,8 @@ inline void state_connected() previous_state = STATE_CONNECTED; } - - if(fork()) { - - for(;;) { - + if (fork()) { + for (;;) { FD_ZERO(&readfds); FD_SET(server_socket, &readfds); @@ -360,32 +347,32 @@ inline void state_connected() * Check if there are more elements in the element buffer before * calling select() and blocking for new packets. */ - if(!more_elements) { - ret = select(server_socket+1, &readfds, NULL, NULL, NULL); + if (!more_elements) { + ret = select(server_socket + 1, &readfds, NULL, NULL, NULL); - if(ret < 0) { + if (ret < 0) { PRINT_ERROR("Error in select()\n"); state = STATE_SHUTDOWN; return; } } - if(FD_ISSET(server_socket, &readfds) || more_elements) { - ret = receive_command(server_socket, (char *) &buf); - if(ret == 0) { - if(!strncmp("< frame", buf, 7)) { - char data_str[2*8]; + if (FD_ISSET(server_socket, &readfds) || more_elements) { + ret = receive_command(server_socket, (char *)&buf); + if (ret == 0) { + if (!strncmp("< frame", buf, 7)) { + char data_str[2 * 8]; sscanf(buf, "< frame %x %*d.%*d %s >", &frame.can_id, data_str); - char* s = buf + 7; - for(; ++s;) { - if(*s== ' ') { + char *s = buf + 7; + for (; ++s;) { + if (*s == ' ') { break; } } - if((s - buf - 7) > 4) + if ((s - buf - 7) > 4) frame.can_id |= CAN_EFF_FLAG; frame.can_dlc = strlen(data_str) / 2; @@ -397,60 +384,58 @@ inline void state_connected() &frame.data[6], &frame.data[7]); ret = write(raw_socket, &frame, sizeof(struct can_frame)); - if(ret"); + sprintf(buf + ret, " >"); const size_t len = strlen(buf); ret = send(server_socket, buf, len, 0); - if(ret < sizeof(len)) { + if (ret < sizeof(len)) { perror("Error sending TCP frame\n"); } } @@ -458,7 +443,6 @@ inline void state_connected() } } } - } /* reads all available data from the socket into the command buffer. @@ -471,16 +455,16 @@ int receive_command(int socket, char *buffer) /* if there are no more elements in the buffer read more data from the * socket. */ - if(!more_elements) { - cmd_index += read(socket, cmd_buffer+cmd_index, MAXLEN-cmd_index); + if (!more_elements) { + cmd_index += read(socket, cmd_buffer + cmd_index, MAXLEN - cmd_index); } more_elements = 0; /* find first '<' in string */ start = -1; - for(i=0; i') { + for (i = 1; i < cmd_index; i++) { + if (cmd_buffer[i] == '>') { stop = i; break; } } /* if no '>' is in the string we have to wait for more data */ - if(stop == -1) { + if (stop == -1) { return -1; } /* copy string to new destination and correct cmd_buffer */ - for(i=start; i<=stop; i++) { - buffer[i-start] = cmd_buffer[i]; + for (i = start; i <= stop; i++) { + buffer[i - start] = cmd_buffer[i]; } - buffer[i-start] = '\0'; - + buffer[i - start] = '\0'; /* if only this message was in the buffer we're done */ - if(stop == cmd_index-1) { + if (stop == cmd_index - 1) { cmd_index = 0; } else { /* check if there is a '<' after the stop */ start = -1; - for(i=stop; i') { + for (i = 1; i < cmd_index; i++) { + if (cmd_buffer[i] == '>') { stop = i; break; } } - if(stop != -1) { + if (stop != -1) { more_elements = 1; } } @@ -557,7 +540,6 @@ int receive_command(int socket, char *buffer) return 0; } - void print_usage(void) { printf("Usage: socketcandcl [-v | --verbose] [-i interfaces | --interfaces interfaces]\n\t\t[-s server | --server server ] [-u name | --afuxname name]\n\t\t[-p port | --port port]\n"); @@ -570,16 +552,14 @@ void print_usage(void) printf("\t-h prints this message\n"); } - void childdied() { wait(NULL); } - void sigint() { - if(verbose_flag) + if (verbose_flag) PRINT_ERROR("received SIGINT\n"); if (server_socket != -1) { @@ -588,8 +568,8 @@ void sigint() close(server_socket); } - if(raw_socket != -1) { - if(verbose_flag) + if (raw_socket != -1) { + if (verbose_flag) PRINT_INFO("closing can socket\n"); close(raw_socket); } diff --git a/state_bcm.c b/state_bcm.c index edfbec7..993e66f 100644 --- a/state_bcm.c +++ b/state_bcm.c @@ -29,7 +29,8 @@ int sc = -1; -void state_bcm() { +void state_bcm() +{ int i, j, ret; struct sockaddr_can caddr; socklen_t caddrlen = sizeof(caddr); @@ -48,7 +49,7 @@ void state_bcm() { struct can_frame frame[257]; /* MAX_NFRAMES + MUX MASK */ } muxmsg; - if(previous_state != STATE_BCM) { + if (previous_state != STATE_BCM) { /* open BCM socket */ if ((sc = socket(PF_CAN, SOCK_DGRAM, CAN_BCM)) < 0) { PRINT_ERROR("Error while opening BCM socket %s\n", strerror(errno)); @@ -61,11 +62,11 @@ void state_bcm() { /* can_ifindex is set to 0 (any device) => need for sendto() */ PRINT_VERBOSE("connecting BCM socket...\n"); - if (connect(sc, (struct sockaddr *)&caddr, sizeof(caddr)) < 0) { - PRINT_ERROR("Error while connecting BCM socket %s\n", strerror(errno)); - state = STATE_SHUTDOWN; - return; - } + if (connect(sc, (struct sockaddr *)&caddr, sizeof(caddr)) < 0) { + PRINT_ERROR("Error while connecting BCM socket %s\n", strerror(errno)); + state = STATE_SHUTDOWN; + return; + } previous_state = STATE_BCM; } @@ -77,14 +78,14 @@ void state_bcm() { * Check if there are more elements in the element buffer before calling select() and * blocking for new packets. */ - if(more_elements) { + if (more_elements) { FD_CLR(sc, &readfds); } else { - ret = select((sc > client_socket)?sc+1:client_socket+1, &readfds, NULL, NULL, NULL); + ret = select((sc > client_socket) ? sc + 1 : client_socket + 1, &readfds, NULL, NULL, NULL); - if(ret < 0) { + if (ret < 0) { PRINT_ERROR("Error in select()\n"); - state = STATE_SHUTDOWN; + state = STATE_SHUTDOWN; return; } } @@ -93,21 +94,21 @@ void state_bcm() { struct timeval tv; ret = recvfrom(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, &caddrlen); + (struct sockaddr *)&caddr, &caddrlen); /* read timestamp data */ - if(ioctl(sc, SIOCGSTAMP, &tv) < 0) { + if (ioctl(sc, SIOCGSTAMP, &tv) < 0) { PRINT_ERROR("Could not receive timestamp\n"); } /* Check if this is an error frame */ - if(msg.msg_head.can_id & CAN_ERR_FLAG) { - if(msg.frame.can_dlc != CAN_ERR_DLC) { + if (msg.msg_head.can_id & CAN_ERR_FLAG) { + if (msg.frame.can_dlc != CAN_ERR_DLC) { PRINT_ERROR("Error frame has a wrong DLC!\n"); - } else { + } else { snprintf(rxmsg, RXLEN, "< error %03X %ld.%06ld ", msg.msg_head.can_id, tv.tv_sec, tv.tv_usec); - for ( i = 0; i < msg.frame.can_dlc; i++) + for (i = 0; i < msg.frame.can_dlc; i++) snprintf(rxmsg + strlen(rxmsg), RXLEN - strlen(rxmsg), "%02X ", msg.frame.data[i]); @@ -116,7 +117,7 @@ void state_bcm() { tcp_quickack(client_socket); } } else { - if(msg.msg_head.can_id & CAN_EFF_FLAG) { + if (msg.msg_head.can_id & CAN_EFF_FLAG) { snprintf(rxmsg, RXLEN, "< frame %08X %ld.%06ld ", msg.msg_head.can_id & CAN_EFF_MASK, tv.tv_sec, tv.tv_usec); } else { @@ -124,7 +125,7 @@ void state_bcm() { msg.msg_head.can_id & CAN_SFF_MASK, tv.tv_sec, tv.tv_usec); } - for ( i = 0; i < msg.frame.can_dlc; i++) + for (i = 0; i < msg.frame.can_dlc; i++) snprintf(rxmsg + strlen(rxmsg), RXLEN - strlen(rxmsg), "%02X ", msg.frame.data[i]); @@ -139,7 +140,7 @@ void state_bcm() { ret = receive_command(client_socket, buf); - if(ret != 0) { + if (ret != 0) { state = STATE_SHUTDOWN; return; } @@ -159,14 +160,14 @@ void state_bcm() { return; } - if(!strcmp("< echo >", buf)) { + if (!strcmp("< echo >", buf)) { send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); return; } /* Send a single frame */ - if(!strncmp("< send ", buf, 7)) { + if (!strncmp("< send ", buf, 7)) { items = sscanf(buf, "< %*s %x %hhu " "%hhx %hhx %hhx %hhx %hhx %hhx " "%hhx %hhx >", @@ -181,15 +182,15 @@ void state_bcm() { &msg.frame.data[6], &msg.frame.data[7]); - if ( (items < 2) || - (msg.frame.can_dlc > 8) || - (items != 2 + msg.frame.can_dlc)) { + if ((items < 2) || + (msg.frame.can_dlc > 8) || + (items != 2 + msg.frame.can_dlc)) { PRINT_ERROR("Syntax error in send command\n"); - return; + return; } /* < send XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 2) == 8) + if (element_length(buf, 2) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = TX_SEND; @@ -198,10 +199,10 @@ void state_bcm() { if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } /* Add a send job */ - } else if(!strncmp("< add ", buf, 6)) { + } else if (!strncmp("< add ", buf, 6)) { items = sscanf(buf, "< %*s %lu %lu %x %hhu " "%hhx %hhx %hhx %hhx %hhx %hhx " "%hhx %hhx >", @@ -218,15 +219,15 @@ void state_bcm() { &msg.frame.data[6], &msg.frame.data[7]); - if( (items < 4) || + if ((items < 4) || (msg.frame.can_dlc > 8) || - (items != 4 + msg.frame.can_dlc) ) { + (items != 4 + msg.frame.can_dlc)) { PRINT_ERROR("Syntax error in add command.\n"); return; } /* < add sec usec XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 4) == 8) + if (element_length(buf, 4) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = TX_SETUP; @@ -236,10 +237,10 @@ void state_bcm() { if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } /* Update send job */ - } else if(!strncmp("< update ", buf, 9)) { + } else if (!strncmp("< update ", buf, 9)) { items = sscanf(buf, "< %*s %x %hhu " "%hhx %hhx %hhx %hhx %hhx %hhx " "%hhx %hhx >", @@ -254,38 +255,38 @@ void state_bcm() { &msg.frame.data[6], &msg.frame.data[7]); - if ( (items < 2) || - (msg.frame.can_dlc > 8) || - (items != 2 + msg.frame.can_dlc)) { + if ((items < 2) || + (msg.frame.can_dlc > 8) || + (items != 2 + msg.frame.can_dlc)) { PRINT_ERROR("Syntax error in update send job command\n"); - return; + return; } /* < update XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 2) == 8) + if (element_length(buf, 2) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = TX_SETUP; - msg.msg_head.flags = 0; + msg.msg_head.flags = 0; msg.frame.can_id = msg.msg_head.can_id; if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } /* Delete a send job */ - } else if(!strncmp("< delete ", buf, 9)) { + } else if (!strncmp("< delete ", buf, 9)) { items = sscanf(buf, "< %*s %x >", &msg.msg_head.can_id); - if (items != 1) { + if (items != 1) { PRINT_ERROR("Syntax error in delete job command\n"); - return; + return; } /* < delete XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 2) == 8) + if (element_length(buf, 2) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = TX_DELETE; @@ -294,10 +295,10 @@ void state_bcm() { if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } /* Receive CAN ID with content matching */ - } else if(!strncmp("< filter ", buf, 9)) { + } else if (!strncmp("< filter ", buf, 9)) { items = sscanf(buf, "< %*s %lu %lu %x %hhu " "%hhx %hhx %hhx %hhx %hhx %hhx " "%hhx %hhx >", @@ -314,29 +315,28 @@ void state_bcm() { &msg.frame.data[6], &msg.frame.data[7]); - if( (items < 4) || + if ((items < 4) || (msg.frame.can_dlc > 8) || - (items != 4 + msg.frame.can_dlc) ) { + (items != 4 + msg.frame.can_dlc)) { PRINT_ERROR("syntax error in filter command.\n"); - return; + return; } /* < filter sec usec XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 4) == 8) + if (element_length(buf, 4) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = RX_SETUP; - msg.msg_head.flags = SETTIMER; + msg.msg_head.flags = SETTIMER; msg.frame.can_id = msg.msg_head.can_id; if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } /* Receive CAN ID with multiplex content matching */ - } else if(!strncmp("< muxfilter ", buf, 12)) { - + } else if (!strncmp("< muxfilter ", buf, 12)) { char *cfptr; char tmp; @@ -348,29 +348,29 @@ void state_bcm() { &muxmsg.msg_head.can_id, &muxmsg.msg_head.nframes); - if( (items != 4) || + if ((items != 4) || (muxmsg.msg_head.nframes < 2) || - (muxmsg.msg_head.nframes > 257) ) { + (muxmsg.msg_head.nframes > 257)) { PRINT_ERROR("syntax error in muxfilter command.\n"); - return; + return; } /* < muxfilter sec usec XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 4) == 8) + if (element_length(buf, 4) == 8) muxmsg.msg_head.can_id |= CAN_EFF_FLAG; muxmsg.msg_head.opcode = RX_SETUP; - muxmsg.msg_head.flags = SETTIMER; + muxmsg.msg_head.flags = SETTIMER; cfptr = element_start(buf, 6); if (cfptr == NULL) { PRINT_ERROR("failed to find filter data start in muxfilter.\n"); - return; + return; } - if (strlen(cfptr) < muxmsg.msg_head.nframes * 24) { + if (strlen(cfptr) < muxmsg.msg_head.nframes * 24) { PRINT_ERROR("muxfilter data too short.\n"); - return; + return; } /* copy filter data and mux mask in muxmsg.frame[0] */ @@ -378,18 +378,18 @@ void state_bcm() { for (j = 0; j < 8; j++) { - tmp = asc2nibble(cfptr[(24*i + 3*j)]); + tmp = asc2nibble(cfptr[(24 * i + 3 * j)]); if (tmp > 0x0F) { PRINT_ERROR("failed to process filter data in muxfilter.\n"); - return; + return; } muxmsg.frame[i].data[j] = (tmp << 4); - tmp = asc2nibble(cfptr[(24*i + 3*j)+1]); + tmp = asc2nibble(cfptr[(24 * i + 3 * j) + 1]); if (tmp > 0x0F) { PRINT_ERROR("failed to process filter data in muxfilter.\n"); - return; + return; } muxmsg.frame[i].data[j] |= tmp; @@ -400,10 +400,10 @@ void state_bcm() { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &muxmsg, sizeof(struct bcm_msg_head) + sizeof(struct can_frame) * muxmsg.msg_head.nframes, - 0, (struct sockaddr*)&caddr, sizeof(caddr)); + 0, (struct sockaddr *)&caddr, sizeof(caddr)); } /* Add a filter */ - } else if(!strncmp("< subscribe ", buf, 12)) { + } else if (!strncmp("< subscribe ", buf, 12)) { items = sscanf(buf, "< %*s %lu %lu %x >", &msg.msg_head.ival2.tv_sec, &msg.msg_head.ival2.tv_usec, @@ -411,34 +411,34 @@ void state_bcm() { if (items != 3) { PRINT_ERROR("syntax error in subscribe command\n"); - return; + return; } /* < subscribe sec usec XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 4) == 8) + if (element_length(buf, 4) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = RX_SETUP; - msg.msg_head.flags = RX_FILTER_ID | SETTIMER; + msg.msg_head.flags = RX_FILTER_ID | SETTIMER; msg.frame.can_id = msg.msg_head.can_id; if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } /* Delete filter */ - } else if(!strncmp("< unsubscribe ", buf, 14)) { + } else if (!strncmp("< unsubscribe ", buf, 14)) { items = sscanf(buf, "< %*s %x >", &msg.msg_head.can_id); if (items != 1) { PRINT_ERROR("syntax error in unsubscribe command\n"); - return; + return; } /* < unsubscribe XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 2) == 8) + if (element_length(buf, 2) == 8) msg.msg_head.can_id |= CAN_EFF_FLAG; msg.msg_head.opcode = RX_DELETE; @@ -447,11 +447,11 @@ void state_bcm() { if (!ioctl(sc, SIOCGIFINDEX, &ifr)) { caddr.can_ifindex = ifr.ifr_ifindex; sendto(sc, &msg, sizeof(msg), 0, - (struct sockaddr*)&caddr, sizeof(caddr)); + (struct sockaddr *)&caddr, sizeof(caddr)); } } else { PRINT_ERROR("unknown command '%s'.\n", buf); - strcpy(buf, "< error unknown command >"); + strcpy(buf, "< error unknown command >"); send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); } diff --git a/state_control.c b/state_control.c index 07324b0..734c060 100644 --- a/state_control.c +++ b/state_control.c @@ -19,20 +19,21 @@ #include #include -void state_control() { +void state_control() +{ char buf[MAXLEN]; int i, items; - if(previous_state != STATE_CONTROL) { + if (previous_state != STATE_CONTROL) { PRINT_VERBOSE("starting statistics thread...\n"); - pthread_create(&statistics_thread, NULL, &statistics_loop, NULL); + pthread_create(&statistics_thread, NULL, &statistics_loop, NULL); previous_state = STATE_CONTROL; } - i = receive_command(client_socket, (char *) &buf); + i = receive_command(client_socket, (char *)&buf); - if(i != 0) { + if (i != 0) { PRINT_ERROR("Connection terminated while waiting for command.\n"); state = STATE_SHUTDOWN; return; @@ -46,24 +47,24 @@ void state_control() { return; } - if(!strcmp("< echo >", buf)) { + if (!strcmp("< echo >", buf)) { send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); return; } - if(!strncmp("< statistics ", buf, 13)) { + if (!strncmp("< statistics ", buf, 13)) { items = sscanf(buf, "< %*s %u >", &i); if (items != 1) { PRINT_ERROR("Syntax error in statistics command\n"); - } else { + } else { statistics_ival = i; } } else { PRINT_ERROR("unknown command '%s'.\n", buf); - strcpy(buf, "< error unknown command >"); + strcpy(buf, "< error unknown command >"); send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); } diff --git a/state_isotp.c b/state_isotp.c index 75cc676..c3c687c 100644 --- a/state_isotp.c +++ b/state_isotp.c @@ -26,7 +26,8 @@ int si = -1; -void state_isotp() { +void state_isotp() +{ int i, items, ret; struct sockaddr_can addr; @@ -36,14 +37,13 @@ void state_isotp() { char rxmsg[MAXLEN]; /* can to inet */ char buf[MAXLEN]; /* inet commands to can */ - unsigned char isobuf[ISOTPLEN+1]; /* binary buffer for isotp socket */ + unsigned char isobuf[ISOTPLEN + 1]; /* binary buffer for isotp socket */ unsigned char tmp; fd_set readfds; - while(previous_state != STATE_ISOTP) { - + while (previous_state != STATE_ISOTP) { ret = receive_command(client_socket, buf); - if(ret != 0) { + if (ret != 0) { state = STATE_SHUTDOWN; return; } @@ -60,7 +60,7 @@ void state_isotp() { return; } - if(!strcmp("< echo >", buf)) { + if (!strcmp("< echo >", buf)) { send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); continue; @@ -71,7 +71,7 @@ void state_isotp() { memset(&addr, 0, sizeof(addr)); /* get configuration to open the socket */ - if(!strncmp("< isotpconf ", buf, 12)) { + if (!strncmp("< isotpconf ", buf, 12)) { items = sscanf(buf, "< %*s %x %x %x " "%hhu %hhx %hhu " "%hhx %hhx %hhx %hhx >", @@ -87,10 +87,10 @@ void state_isotp() { &opts.rx_ext_address); /* < isotpconf XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 2) == 8) + if (element_length(buf, 2) == 8) addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; - if(element_length(buf, 3) == 8) + if (element_length(buf, 3) == 8) addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; if ((opts.flags & CAN_ISOTP_RX_EXT_ADDR && items < 10) || @@ -113,7 +113,7 @@ void state_isotp() { } strcpy(ifr.ifr_name, bus_name); - if(ioctl(si, SIOCGIFINDEX, &ifr) < 0) { + if (ioctl(si, SIOCGIFINDEX, &ifr) < 0) { PRINT_ERROR("Error while searching for bus %s\n", strerror(errno)); /* ensure proper handling in other states */ previous_state = STATE_ISOTP; @@ -152,37 +152,34 @@ void state_isotp() { * Check if there are more elements in the element buffer before calling select() and * blocking for new packets. */ - if(more_elements) { + if (more_elements) { FD_CLR(si, &readfds); } else { - ret = select((si > client_socket)?si+1:client_socket+1, &readfds, NULL, NULL, NULL); - if(ret < 0) { + ret = select((si > client_socket) ? si + 1 : client_socket + 1, &readfds, NULL, NULL, NULL); + if (ret < 0) { PRINT_ERROR("Error in select()\n"); - state = STATE_SHUTDOWN; return; } } if (FD_ISSET(si, &readfds)) { - - struct timeval tv = {0}; + struct timeval tv = { 0 }; items = read(si, isobuf, ISOTPLEN); /* read timestamp data */ - if(ioctl(si, SIOCGSTAMP, &tv) < 0) { + if (ioctl(si, SIOCGSTAMP, &tv) < 0) { PRINT_ERROR("Could not receive timestamp\n"); } if (items > 0 && items <= ISOTPLEN) { - int startlen; sprintf(rxmsg, "< pdu %ld.%06ld ", tv.tv_sec, tv.tv_usec); startlen = strlen(rxmsg); - for (i=0; i < items; i++) - sprintf(rxmsg + startlen + 2*i, "%02X", isobuf[i]); + for (i = 0; i < items; i++) + sprintf(rxmsg + startlen + 2 * i, "%02X", isobuf[i]); sprintf(rxmsg + strlen(rxmsg), " >"); send(client_socket, rxmsg, strlen(rxmsg), 0); @@ -191,9 +188,8 @@ void state_isotp() { } if (FD_ISSET(client_socket, &readfds)) { - ret = receive_command(client_socket, buf); - if(ret != 0) { + if (ret != 0) { state = STATE_SHUTDOWN; return; } @@ -206,13 +202,13 @@ void state_isotp() { return; } - if(!strcmp("< echo >", buf)) { + if (!strcmp("< echo >", buf)) { send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); return; } - if(!strncmp("< sendpdu ", buf, 10)) { + if (!strncmp("< sendpdu ", buf, 10)) { items = element_length(buf, 2); if (items & 1) { PRINT_ERROR("odd number of ASCII Hex values\n"); @@ -226,26 +222,25 @@ void state_isotp() { } for (i = 0; i < items; i++) { - - tmp = asc2nibble(buf[(2*i) + 10]); + tmp = asc2nibble(buf[(2 * i) + 10]); if (tmp > 0x0F) return; isobuf[i] = (tmp << 4); - tmp = asc2nibble(buf[(2*i) + 11]); + tmp = asc2nibble(buf[(2 * i) + 11]); if (tmp > 0x0F) return; isobuf[i] |= tmp; } ret = write(si, isobuf, items); - if(ret != items) { + if (ret != items) { PRINT_ERROR("Error in write()\n"); - state = STATE_SHUTDOWN; + state = STATE_SHUTDOWN; return; } } else { PRINT_ERROR("unknown command '%s'.\n", buf); - strcpy(buf, "< error unknown command >"); + strcpy(buf, "< error unknown command >"); send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); } diff --git a/state_nobus.c b/state_nobus.c index f8770cd..5f5512e 100644 --- a/state_nobus.c +++ b/state_nobus.c @@ -6,7 +6,7 @@ #include #include -static int check_bus(const char *bus_name) +static int check_bus(const char *bus_name) { int found = 0, i; @@ -45,8 +45,8 @@ void state_nobus(void) PRINT_INFO("client tried to access unauthorized bus.\n"); strcpy(buf, "< error could not open bus >"); goto shutdown_err; - } - if (canctl_start_iface (bus_name)) { + } + if (canctl_start_iface(bus_name)) { PRINT_INFO("Error starting CAN interface.\n"); snprintf(buf, MAXLEN, "< error could not start interface %s >", bus_name); goto shutdown_err; @@ -59,29 +59,29 @@ void state_nobus(void) PRINT_INFO("client tried to access unauthorized bus.\n"); strcpy(buf, "< error could not open bus >"); goto shutdown_err; - } + } /* Check the configuration operation */ switch (op) { - case 'B': - if (canctl_set_bittiming(bus_name, buf, strlen(buf))) { - PRINT_ERROR("Error configuring bus bittiming.\n"); - snprintf(buf, MAXLEN, "< error configuring interface %s > \n", bus_name); - goto shutdown_err; - } - break; - case 'C': - if (canctl_set_control_modes(bus_name, buf, strlen(buf))) { - PRINT_ERROR("Error configuring bus control modes.\n"); - snprintf(buf, MAXLEN, "< error configuring interface %s > \n", bus_name); - goto shutdown_err; - } - break; - default: - PRINT_ERROR("Configuration operation not supported\n"); - snprintf(buf, MAXLEN, "< configuration operation not supported %c > \n", op); + case 'B': + if (canctl_set_bittiming(bus_name, buf, strlen(buf))) { + PRINT_ERROR("Error configuring bus bittiming.\n"); + snprintf(buf, MAXLEN, "< error configuring interface %s > \n", bus_name); goto shutdown_err; - break; + } + break; + case 'C': + if (canctl_set_control_modes(bus_name, buf, strlen(buf))) { + PRINT_ERROR("Error configuring bus control modes.\n"); + snprintf(buf, MAXLEN, "< error configuring interface %s > \n", bus_name); + goto shutdown_err; + } + break; + default: + PRINT_ERROR("Configuration operation not supported\n"); + snprintf(buf, MAXLEN, "< configuration operation not supported %c > \n", op); + goto shutdown_err; + break; } goto return_ok; @@ -101,4 +101,4 @@ void state_nobus(void) send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); state = STATE_SHUTDOWN; -} \ No newline at end of file +} \ No newline at end of file diff --git a/state_raw.c b/state_raw.c index e432c03..8246f1f 100644 --- a/state_raw.c +++ b/state_raw.c @@ -32,21 +32,21 @@ char ctrlmsg[CMSG_SPACE(sizeof(struct timeval)) + CMSG_SPACE(sizeof(__u32))]; struct timeval tv; struct cmsghdr *cmsg; -void state_raw() { +void state_raw() +{ char buf[MAXLEN]; int i, ret, items; fd_set readfds; - if(previous_state != STATE_RAW) { - - if((raw_socket = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) { + if (previous_state != STATE_RAW) { + if ((raw_socket = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) { PRINT_ERROR("Error while creating RAW socket %s\n", strerror(errno)); state = STATE_SHUTDOWN; return; } strcpy(ifr.ifr_name, bus_name); - if(ioctl(raw_socket, SIOCGIFINDEX, &ifr) < 0) { + if (ioctl(raw_socket, SIOCGIFINDEX, &ifr) < 0) { PRINT_ERROR("Error while searching for bus %s\n", strerror(errno)); state = STATE_SHUTDOWN; return; @@ -56,13 +56,13 @@ void state_raw() { addr.can_ifindex = ifr.ifr_ifindex; const int timestamp_on = 1; - if(setsockopt( raw_socket, SOL_SOCKET, SO_TIMESTAMP, ×tamp_on, sizeof(timestamp_on)) < 0) { + if (setsockopt(raw_socket, SOL_SOCKET, SO_TIMESTAMP, ×tamp_on, sizeof(timestamp_on)) < 0) { PRINT_ERROR("Could not enable CAN timestamps\n"); state = STATE_SHUTDOWN; return; } - if(bind(raw_socket, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + if (bind(raw_socket, (struct sockaddr *)&addr, sizeof(addr)) < 0) { PRINT_ERROR("Error while binding RAW socket %s\n", strerror(errno)); state = STATE_SHUTDOWN; return; @@ -85,65 +85,64 @@ void state_raw() { * Check if there are more elements in the element buffer before calling select() and * blocking for new packets. */ - if(more_elements) { + if (more_elements) { FD_CLR(raw_socket, &readfds); } else { - ret = select((raw_socket > client_socket)?raw_socket+1:client_socket+1, &readfds, NULL, NULL, NULL); + ret = select((raw_socket > client_socket) ? raw_socket + 1 : client_socket + 1, &readfds, NULL, NULL, NULL); - if(ret < 0) { + if (ret < 0) { PRINT_ERROR("Error in select()\n"); - state = STATE_SHUTDOWN; + state = STATE_SHUTDOWN; return; } } - if(FD_ISSET(raw_socket, &readfds)) { + if (FD_ISSET(raw_socket, &readfds)) { iov.iov_len = sizeof(frame); msg.msg_namelen = sizeof(addr); msg.msg_flags = 0; msg.msg_controllen = sizeof(ctrlmsg); ret = recvmsg(raw_socket, &msg, 0); - if(ret < sizeof(struct can_frame)) { + if (ret < sizeof(struct can_frame)) { PRINT_ERROR("Error reading frame from RAW socket\n"); - } else { + } else { /* read timestamp data */ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg && (cmsg->cmsg_level == SOL_SOCKET); - cmsg = CMSG_NXTHDR(&msg,cmsg)) { + cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_type == SO_TIMESTAMP) { tv = *(struct timeval *)CMSG_DATA(cmsg); } } - if(frame.can_id & CAN_ERR_FLAG) { - canid_t class = frame.can_id & CAN_EFF_MASK; + if (frame.can_id & CAN_ERR_FLAG) { + canid_t class = frame.can_id & CAN_EFF_MASK; ret = sprintf(buf, "< error %03X %ld.%06ld >", class, tv.tv_sec, tv.tv_usec); send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); - } else if(frame.can_id & CAN_RTR_FLAG) { + } else if (frame.can_id & CAN_RTR_FLAG) { /* TODO implement */ } else { - if(frame.can_id & CAN_EFF_FLAG) { + if (frame.can_id & CAN_EFF_FLAG) { ret = sprintf(buf, "< frame %08X %ld.%06ld ", frame.can_id & CAN_EFF_MASK, tv.tv_sec, tv.tv_usec); } else { ret = sprintf(buf, "< frame %03X %ld.%06ld ", frame.can_id & CAN_SFF_MASK, tv.tv_sec, tv.tv_usec); } - for(i=0;i"); + sprintf(buf + ret, " >"); send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); } } } - if(FD_ISSET(client_socket, &readfds)) { - ret = receive_command(client_socket, (char *) &buf); - - if(ret == 0) { + if (FD_ISSET(client_socket, &readfds)) { + ret = receive_command(client_socket, (char *)&buf); + if (ret == 0) { if (state_changed(buf, state)) { close(raw_socket); strcpy(buf, "< ok >"); @@ -152,14 +151,14 @@ void state_raw() { return; } - if(!strcmp("< echo >", buf)) { + if (!strcmp("< echo >", buf)) { send(client_socket, buf, strlen(buf), 0); tcp_quickack(client_socket); return; } /* Send a single frame */ - if(!strncmp("< send ", buf, 7)) { + if (!strncmp("< send ", buf, 7)) { items = sscanf(buf, "< %*s %x %hhu " "%hhx %hhx %hhx %hhx %hhx %hhx " "%hhx %hhx >", @@ -174,19 +173,19 @@ void state_raw() { &frame.data[6], &frame.data[7]); - if ( (items < 2) || - (frame.can_dlc > 8) || - (items != 2 + frame.can_dlc)) { + if ((items < 2) || + (frame.can_dlc > 8) || + (items != 2 + frame.can_dlc)) { PRINT_ERROR("Syntax error in send command\n"); - return; + return; } /* < send XXXXXXXX ... > check for extended identifier */ - if(element_length(buf, 2) == 8) + if (element_length(buf, 2) == 8) frame.can_id |= CAN_EFF_FLAG; ret = send(raw_socket, &frame, sizeof(struct can_frame), 0); - if(ret==-1) { + if (ret == -1) { state = STATE_SHUTDOWN; return; } @@ -204,7 +203,7 @@ void state_raw() { } else { ret = read(client_socket, &buf, 0); tcp_quickack(client_socket); - if(ret==-1) { + if (ret == -1) { state = STATE_SHUTDOWN; return; } diff --git a/statistics.c b/statistics.c index 9e3259b..9b26348 100644 --- a/statistics.c +++ b/statistics.c @@ -16,7 +16,8 @@ int statistics_ival = 0; struct timeval last_fired; -void *statistics_loop(void *ptr) { +void *statistics_loop(void *ptr) +{ int items, found; struct timeval current_time; int elapsed; @@ -29,71 +30,71 @@ void *statistics_loop(void *ptr) { gettimeofday(&last_fired, 0); - while(1) { + while (1) { /* check if statistics are enabled */ - if( statistics_ival == 0 ) { + if (statistics_ival == 0) { sleep(1); continue; } /* read /proc/net/dev */ - proc_net_dev = fopen( "/proc/net/dev", "r" ); - if( proc_net_dev == NULL ) { + proc_net_dev = fopen("/proc/net/dev", "r"); + if (proc_net_dev == NULL) { PRINT_ERROR("could not open /proc/net/dev"); sleep(1); continue; } - found=0; - while(1) { - if(fgets( line , PROC_LINESIZE, proc_net_dev ) == NULL) + found = 0; + while (1) { + if (fgets(line, PROC_LINESIZE, proc_net_dev) == NULL) break; /* extract name */ - char* s = (char *) &line; - char* name = strsep(&s, ":"); - if(s == NULL) { /* no : in line */ + char *s = (char *)&line; + char *name = strsep(&s, ":"); + if (s == NULL) { /* no : in line */ continue; } /* remove heading whitespace */ int pos = 0; - for(;pos= statistics_ival) { + elapsed = ((current_time.tv_sec - last_fired.tv_sec) * 1000 + + (current_time.tv_usec - last_fired.tv_usec) / 1000.0) + 0.5; + if (elapsed >= statistics_ival) { /* * TODO this does not work for virtual devices. therefore it is commented out until * a solution is found to identify virtual CAN devices @@ -119,14 +119,14 @@ void *statistics_loop(void *ptr) { continue; }*/ - snprintf( buffer, STAT_BUF_LEN, "< stat %u %u %u %u >", - proc_entry.rbytes, - proc_entry.rpackets, - proc_entry.tbytes, - proc_entry.tpackets); + snprintf(buffer, STAT_BUF_LEN, "< stat %u %u %u %u >", + proc_entry.rbytes, + proc_entry.rpackets, + proc_entry.tbytes, + proc_entry.tpackets); /* no lock needed here because POSIX send is thread-safe and does locking itself */ - send( client_socket, buffer, strlen(buffer), 0 ); + send(client_socket, buffer, strlen(buffer), 0); tcp_quickack(client_socket); last_fired.tv_sec = current_time.tv_sec;